Skip to content

Commit

Permalink
Merge pull request #86 from ARF-SS13/skindmf
Browse files Browse the repository at this point in the history
*repixels ur tab bar
  • Loading branch information
Tk420634 authored Dec 4, 2024
2 parents 7274a57 + 52c1ad6 commit 9f1a9ea
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 17 deletions.
4 changes: 2 additions & 2 deletions code/datums/traits/good.dm
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ GLOBAL_LIST_INIT(security_expert, list(
medical_record_text = "Patient appears to be a well renowned gunsmith."
*/

/*

/datum/quirk/voracious
name = "Bottomless Stomach"
desc = "Nothing gets between I and my food. I eat twice as fast as everyone else!"
Expand All @@ -684,7 +684,7 @@ GLOBAL_LIST_INIT(security_expert, list(
gain_text = span_notice("I feel HONGRY.")
lose_text = span_danger("I no longer feel HONGRY.")
medical_record_text = "Patient demonstrates a disturbing capacity for eating. Please, make sure they don't eat my lunch again."
*/
//butts

/*
/datum/quirk/bloodpressure
Expand Down
64 changes: 49 additions & 15 deletions interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,24 @@ window "mainwindow"
size = 640x440
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
title = "Foxybar"
macro = "default"
menu = "menu"
outer-size = 656x518
outer-pos = 291,0
inner-size = 640x440
inner-pos = 8,51
screen-size = 2560x1392
elem "split"
type = CHILD
pos = 3,0
size = 637x440
anchor1 = 0,0
anchor2 = 100,100
background-color = none
saved-params = "splitter"
left = "mapwindow"
right = "infowindow"
Expand All @@ -75,6 +82,7 @@ window "mainwindow"
size = 200x200
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
is-visible = false
saved-params = ""
elem "tooltip"
Expand All @@ -83,18 +91,25 @@ window "mainwindow"
size = 999x999
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
is-visible = false
saved-params = ""

window "mapwindow"
elem "mapwindow"
type = MAIN
pos = 0,0
pos = 291,0
size = 1024x1024
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
outer-size = 1040x1082
outer-pos = 291,0
inner-size = 1024x1024
inner-pos = 8,31
screen-size = 2560x1392
elem "map"
type = MAP
pos = 0,0
Expand All @@ -103,7 +118,6 @@ window "mapwindow"
anchor2 = 100,100
font-family = "Arial"
font-size = 7
text-color = none
is-default = true
saved-params = "zoom;letterbox;zoom-mode"
style = ".center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }"
Expand All @@ -125,8 +139,8 @@ window "infowindow"
screen-size = 2560x1392
elem "info"
type = CHILD
pos = 8,0
size = 632x480
pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
background-color = none
Expand All @@ -139,14 +153,20 @@ window "outputwindow"
elem "outputwindow"
type = MAIN
pos = 291,0
size = 640x480
size = 640x481
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
outer-size = 656x539
outer-pos = 291,0
inner-size = 640x481
inner-pos = 8,31
screen-size = 2560x1392
elem "input"
type = INPUT
pos = 2,460
pos = 2,461
size = 595x20
anchor1 = 0,100
anchor2 = 100,100
Expand All @@ -156,10 +176,11 @@ window "outputwindow"
saved-params = "command"
elem "saybutton"
type = BUTTON
pos = 600,460
pos = 600,461
size = 37x20
anchor1 = 100,100
anchor2 = -1,-1
background-color = none
saved-params = "is-checked"
text = "Chat"
command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\""
Expand All @@ -168,7 +189,7 @@ window "outputwindow"
elem "browseroutput"
type = BROWSER
pos = 0,0
size = 640x456
size = 640x457
anchor1 = 0,0
anchor2 = 100,100
background-color = #ffffff
Expand All @@ -178,7 +199,7 @@ window "outputwindow"
elem "output"
type = OUTPUT
pos = 0,0
size = 640x456
size = 640x457
anchor1 = 0,0
anchor2 = 100,100
is-default = true
Expand All @@ -191,10 +212,16 @@ window "popupwindow"
size = 549x549
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
is-visible = false
saved-params = "pos;size;is-minimized;is-maximized"
statusbar = false
can-resize = false
outer-size = 565x588
outer-pos = 291,0
inner-size = 549x549
inner-pos = 8,31
screen-size = 2560x1392

window "preferences_window"
elem "preferences_window"
Expand All @@ -203,20 +230,27 @@ window "preferences_window"
size = 1280x1001
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
is-visible = false
saved-params = "pos;size;is-maximized;focus"
statusbar = false
image = 'C:\\Users\\tk420\\Pictures\\1712666654961543.jpg'
outer-size = 1296x1040
outer-pos = 291,0
inner-size = 1280x1001
inner-pos = 8,31
screen-size = 2560x1392
elem "preferences_browser"
type = BROWSER
pos = 0,0
size = 864x1000
anchor1 = 0,0
anchor2 = 75,100
background-color = none
saved-params = ""
elem "character_preview_map"
type = MAP
pos = 861,0
pos = 864,0
size = 419x1001
anchor1 = 75,0
anchor2 = 100,100
Expand All @@ -227,22 +261,22 @@ window "statwindow"
elem "statwindow"
type = MAIN
pos = 291,0
size = 1006x787
size = 1308x954
anchor1 = -1,-1
anchor2 = -1,-1
background-color = none
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
image = 'C:\\Users\\tk420\\Pictures\\1712666654961543.jpg'
outer-size = 1022x845
outer-size = 1324x1012
outer-pos = 291,0
inner-size = 1006x787
inner-size = 1308x954
inner-pos = 8,31
screen-size = 2560x1392
elem "statbrowser"
type = BROWSER
pos = 16,-8
size = 1000x792
pos = 0,0
size = 1318x959
anchor1 = 0,0
anchor2 = 100,100
background-color = none
Expand Down

0 comments on commit 9f1a9ea

Please sign in to comment.