shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with master

Browse Source
This commit is contained in:
Poojawa
2018-01-31 07:02:55 -06:00
parent a7f0ffb6f0 18229f81b7
commit d7659ac6b2
45 changed files with 4136 additions and 317055 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/derelict6.dmm
+1 -1
View File
@@ -29,7 +29,7 @@
"af" = (
/obj/structure/fluff/broken_flooring{
icon_state = "pile";
dir = 8
dir = 8;
},
/turf/template_noop,
/area/template_noop)
_maps/cit_map_files/BoxStation/BoxStation.dmm
+193 -184
View File
@@ -25476,7 +25476,15 @@
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
"bml" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/mineral/ore_redemption{
input_dir = 4;
output_dir = 8
},
/obj/machinery/door/firedoor,
/obj/machinery/door/window/eastleft{
name = "ORM Access";
req_access_txt = "64"
},
/turf/open/floor/plasteel/floorgrime,
/area/quartermaster/office)
"bmm" = (
@@ -28833,9 +28841,6 @@
},
/area/quartermaster/office)
"bud" = (
/obj/effect/turf_decal/loading_area{
dir = 1
},
/turf/open/floor/plasteel/brown/corner{
dir = 8
},
@@ -56896,12 +56901,8 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"QoO" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 2;
output_dir = 1
},
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/quartermaster/miningdock)
"QoP" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -60316,6 +60317,14 @@
},
/turf/closed/wall/r_wall,
/area/engine/gravity_generator)
"Qyg" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"Qyh" = (
/obj/machinery/rnd/protolathe/department/cargo,
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
(1,1,1) = {"
aaa
@@ -76408,7 +76417,7 @@ aaa
aaa
aaa
aaa
QuO
QuN
aaa
aoV
aaa
@@ -76665,7 +76674,7 @@ aaa
aaa
aaa
aaa
QuP
QuN
aaa
aoV
aaa
@@ -76922,7 +76931,7 @@ aaa
aaa
aaa
aaa
QuQ
QuN
aaa
aoV
aaa
@@ -77179,7 +77188,7 @@ aaa
aaa
aaa
aaa
QuR
QuN
aaa
aoV
aaa
@@ -77436,7 +77445,7 @@ aaa
aaa
aaa
aaa
QuS
QuN
aaa
aoV
aaa
@@ -78979,9 +78988,9 @@ aaf
aaf
aaf
aag
QuV
QuU
QuX
Qvb
QuU
bVx
caf
aoV
@@ -80219,7 +80228,7 @@ Qtq
Qtx
QtC
QtK
aKu
QtM
aLF
aLF
aOs
@@ -80471,7 +80480,7 @@ ayB
QsU
Qtb
Qtk
Qtp
Qto
Qtr
Qty
QtD
@@ -80728,12 +80737,12 @@ ayB
QsV
Qtc
aBT
aDs
Qto
aEN
aGb
QtE
Qtx
QtM
QtM
aKu
aLE
aLE
aOl
@@ -80752,7 +80761,7 @@ aZF
aZF
bgy
aZE
QoN
bjr
bjr
ama
bmh
@@ -80779,7 +80788,7 @@ aaa
bCq
bPV
bCq
QuZ
QuY
bTw
bCq
bVD
@@ -81037,7 +81046,7 @@ bCq
bPW
QuW
bSp
bTv
Qve
bCq
bVC
bWx
@@ -81760,8 +81769,8 @@ aDv
aEP
aGe
QtH
QtN
aKu
QtM
QtM
aLE
aMS
aOt
@@ -81809,19 +81818,19 @@ bPY
cOw
bCq
Qvf
Qvm
Qvu
QvE
QvP
Qvf
Qvf
Qvf
Qvf
Qwa
Qwl
Qwv
cjn
cjn
cjn
cjn
cjn
cjn
Qvf
Qvf
Qvf
Qvf
Qvf
Qvf
Qvf
Qvf
bUs
bLv
aaa
@@ -82065,20 +82074,20 @@ bCq
bPX
bRg
bRg
Qvg
Qvf
Qvn
bVG
QvF
QvQ
Qwb
Qvn
Qwm
Qww
bcU
Qvf
Qvn
QwJ
bVG
bcU
Qvn
Qxf
cjn
Qvf
bUs
bLv
aaa
@@ -82275,7 +82284,7 @@ Qtw
QtB
QtJ
QtP
aKu
QtM
aLE
aMS
aOi
@@ -82307,7 +82316,7 @@ bOL
bxy
byF
bwW
bGm
Qyh
bCo
bDk
bEK
@@ -82322,20 +82331,20 @@ bLv
bQa
bHE
bHE
Qvh
Qvf
Qvo
Qvv
QvG
QvR
Qwc
Qwn
QvR
Qwx
QwD
QwK
QvR
QvR
QwQ
QwZ
QwN
Qxg
cjn
Qvf
bUs
bLv
aaf
@@ -82587,12 +82596,12 @@ QvS
Qwd
Qwo
Qwy
QwE
Qwo
QwL
QwR
cCa
bcU
cjn
Qvn
Qvf
bUs
bLv
aaa
@@ -82615,8 +82624,8 @@ QxL
QxQ
bgN
QxU
QxX
Qyb
QxV
QxW
bgN
btG
aaa
@@ -82836,20 +82845,20 @@ bLv
bHE
bHE
bSs
Qvj
Qvf
Qvq
Qvx
QvI
QvT
Qwe
bcU
Qvx
Qvn
Qwz
QwF
cCa
QwS
Qxa
Qxh
cjn
Qvf
bUs
bLv
aaa
@@ -82868,7 +82877,7 @@ Qxu
btF
bsc
QxI
QxM
QxL
QxR
bgN
QxV
@@ -83073,10 +83082,10 @@ bnz
bpA
bbR
bkM
bbR
bqs
bud
QoO
kSb
byE
bAZ
bGm
bzF
@@ -83093,20 +83102,20 @@ bCq
bHE
bRh
bLu
Qvk
Qvf
Qvr
Qvy
QvJ
QvU
Qwf
Qwp
QwA
bcU
Qvf
Qvn
QwM
QwT
Qxb
QwS
Qxa
Qxi
cjn
Qvf
bUs
bLv
aaf
@@ -83125,12 +83134,12 @@ Qxv
btG
QxE
bsc
QxN
QxS
QxL
QxQ
bgN
QxW
QxY
Qyd
QxV
QxU
bgN
btG
aaa
@@ -83350,20 +83359,20 @@ bCq
bOK
bCq
bCq
Qvl
Qvf
Qvs
Qvz
QvK
QvV
Qwg
Qwq
cjn
bcU
Qvf
Qvf
Qvn
cCa
QwU
Qxc
cCa
cjn
Qvf
bUs
bLv
aaa
@@ -83377,9 +83386,9 @@ coz
cpn
Qxn
Qxo
Qxr
Qxo
Qxw
QxA
Qxo
QxF
QxJ
QxO
@@ -83587,7 +83596,7 @@ boR
bqs
bbR
bkM
bbR
Qyg
bwd
bxB
bvL
@@ -83609,18 +83618,18 @@ bLv
aaa
bLv
Qvt
QvA
QvL
QvW
Qwh
Qwr
bcU
bcU
bcU
Qvz
Qvf
Qvf
Qvf
Qvf
Qvn
Qvn
Qvn
QwV
cCa
Qxj
cjn
Qvf
bUs
bLv
aaa
@@ -83865,19 +83874,19 @@ bHE
bLv
aaf
bLv
bUt
QvB
Qvt
Qvz
QvM
QvX
Qwi
Qws
bcU
QwG
Qvn
QwF
QwN
QwW
bcU
bcU
cjn
Qvn
Qvn
Qvf
bUs
bLv
aaf
@@ -83892,7 +83901,7 @@ cjJ
cjJ
aaa
aaa
Qxy
Qxx
aaf
aaa
aaa
@@ -84122,19 +84131,19 @@ bLv
bCq
aaa
bLv
bUt
QvC
Qvt
Qvz
QvN
QvY
Qwj
Qwt
Qvf
QwB
QwH
QwO
QwX
Qxd
Qxk
cjn
Qvf
bUs
bCq
aaa
@@ -84149,7 +84158,7 @@ cpo
cjJ
aaa
aaa
Qxz
Qxx
aaf
Qoi
aaa
@@ -84301,8 +84310,8 @@ afy
agh
abc
Qrx
QrD
QrG
Qrx
Qrx
aiV
ajs
akb
@@ -84382,15 +84391,15 @@ bTB
bUv
QvD
QvO
QvZ
Qwk
Qwu
QwC
QwI
QwP
QwY
Qxe
Qxl
QvO
QvO
QvO
QvO
QvO
QvO
QvO
QvO
QvO
car
bUs
bCq
@@ -84557,9 +84566,9 @@ aeK
afx
agg
abc
Qry
Qrx
QrE
QrH
Qrx
aiV
ajr
aka
@@ -84814,9 +84823,9 @@ aeN
afA
afA
afA
Qrz
QrF
QrI
Qrx
Qrx
Qrx
aiV
aju
akd
@@ -87649,7 +87658,7 @@ aja
akl
akP
alx
amh
Qsf
ami
aiX
anw
@@ -88212,10 +88221,10 @@ aaa
Qoi
aaa
Quu
bsb
bsb
bsb
bsb
Quu
Quu
Quu
Quu
aXf
aJq
byU
@@ -88468,11 +88477,11 @@ aBb
aBb
Quq
aaa
bsb
Quu
Quw
QuD
QuG
bsb
Quu
QuK
aJq
bBi
@@ -88655,7 +88664,7 @@ aaa
aaa
aaa
aaf
Qqx
Qqw
aaf
aaZ
QqI
@@ -88717,7 +88726,7 @@ aZR
aZR
aZR
bft
QtZ
QtX
aBa
Quj
bmv
@@ -88725,7 +88734,7 @@ Qum
bnT
bpg
aaa
bsb
Quu
Qux
buP
bwm
@@ -88912,12 +88921,12 @@ aaa
aaa
aaa
aaf
Qqy
Qqw
aaf
aaZ
QqJ
QqI
QqU
Qrd
Qrc
aaZ
acl
cxA
@@ -88930,7 +88939,7 @@ ahx
ahS
aiK
QrN
QrP
QrO
akm
akT
aly
@@ -88974,7 +88983,7 @@ bbm
bdh
bee
bfv
Qua
QtX
aBa
big
aEM
@@ -89169,10 +89178,10 @@ aaa
aaa
aaa
aaf
Qqz
Qqw
aaf
aaZ
QqK
QqI
QqV
Qre
aaZ
@@ -89191,18 +89200,18 @@ ajI
akl
akS
alx
amh
Qsf
amp
aiX
anS
aoy
QsH
QsK
QsM
QsN
QsO
QsP
QsQ
QsK
QsK
QsK
QsK
QsK
QsS
axB
anz
@@ -89231,7 +89240,7 @@ bcf
bdg
bed
bfv
Qub
QtX
aBa
aBV
bkZ
@@ -89426,11 +89435,11 @@ aaa
aaa
aaa
aaf
QqA
Qqw
aaf
aaZ
QqL
QqW
QqI
QqU
Qrf
aaZ
Qrl
@@ -89488,7 +89497,7 @@ bbm
bdh
bef
bfv
Quc
QtX
aBa
Quk
aEO
@@ -89683,12 +89692,12 @@ aaa
aaa
aaa
aaf
QqB
Qqw
aaf
aaZ
QqM
QqX
Qrg
Qrf
aaZ
Qrm
coS
@@ -89745,7 +89754,7 @@ aZR
aZR
aZR
bfw
Qud
QtX
aBa
Qul
bjy
@@ -89753,7 +89762,7 @@ Qup
bnW
bpi
aaa
bsb
Quu
QuB
buR
bwo
@@ -89940,7 +89949,7 @@ aaa
aaa
aaa
aaf
QqC
Qqw
aaf
aaZ
QqN
@@ -89966,7 +89975,7 @@ amn
amV
Qsr
anB
QsF
Qsn
aod
aqf
ahT
@@ -90010,11 +90019,11 @@ aBc
aBc
Qus
aaa
bsb
Quu
QuC
QuF
QuI
bsb
Quu
QuL
aJq
bBu
@@ -90197,7 +90206,7 @@ aaa
aaa
aaa
aaf
QqD
Qqw
aaf
aaZ
QqO
@@ -90259,19 +90268,19 @@ bcg
aZU
beg
aYB
Quf
Qui
QtX
Quh
aaf
aaf
Qoi
aaa
Qoi
aaa
bsb
bsb
bsb
bsb
bsb
Quu
Quu
Quu
Quu
Quu
aJq
aJq
bBt
@@ -90454,7 +90463,7 @@ aaa
aaa
aaa
aaf
QqE
Qqw
aaf
aaZ
QqP
@@ -90477,9 +90486,9 @@ akr
akX
alC
Qsk
amX
amX
amX
Qsk
Qsk
Qsk
aoB
aod
aqe
@@ -90734,8 +90743,8 @@ ahY
akX
Qse
amo
amX
amX
Qsk
Qsk
Qsz
QsG
QsI
@@ -90970,7 +90979,7 @@ aaa
aaa
abp
QqF
QqG
QqF
QqQ
abO
abO
@@ -90986,11 +90995,11 @@ ahA
ahZ
adR
aiQ
QrU
QrO
akt
Qsc
anw
Qsl
Qse
Qsn
anB
QsA
@@ -91247,10 +91256,10 @@ ajK
aks
akY
anA
Qsm
Qse
Qso
amo
QsB
QsA
aoC
aod
aqe
@@ -91486,10 +91495,10 @@ abp
abO
abO
QqR
Qrb
acq
acq
acq
QqR
QqR
QqR
QqR
abO
aew
afe
@@ -91506,7 +91515,7 @@ aiX
akz
alf
Qsp
Qst
Qsp
QsC
aoF
apo
@@ -92001,9 +92010,9 @@ aco
QqH
QqS
abR
abP
abP
abP
QqS
QqS
QqS
abl
abp
abp
_maps/cit_map_files/Deltastation/DeltaStation2.dmm
+19 -10
View File
@@ -105034,13 +105034,8 @@
/turf/open/floor/plasteel/brown,
/area/quartermaster/office)
"ehK" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 4;
output_dir = 8
},
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/box,
/turf/open/floor/plasteel/neutral,
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"ehL" = (
/obj/structure/cable/white{
@@ -105534,6 +105529,20 @@
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"QOt" = (
/obj/machinery/mineral/ore_redemption{
input_dir = 2;
output_dir = 1
},
/obj/effect/turf_decal/stripes/box,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/southright{
name = "ORM Access";
req_access_txt = "64"
},
/obj/structure/window/reinforced/spawner/west,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
(1,1,1) = {"
aaa
@@ -148817,7 +148826,7 @@ bgK
bii
bjU
blR
baU
QOt
boO
bqZ
bsT
@@ -149542,7 +149551,7 @@ afj
ahH
abi
aip
QOo
QOn
ajb
ajo
ajP
@@ -150314,7 +150323,7 @@ ahH
abi
ais
aiI
QOp
QOn
ajq
aig
akt
_maps/cit_map_files/MetaStation/MetaStation.dmm
+4
View File
@@ -30886,6 +30886,10 @@
"bmh" = (
/obj/machinery/door/firedoor,
/obj/machinery/mineral/ore_redemption,
/obj/machinery/door/window/southright{
name = "ORM Access";
req_access_txt = "64"
},
/turf/open/floor/plasteel/dark,
/area/quartermaster/office)
"bmi" = (
_maps/cit_map_files/OmegaStation/OmegaStation.dmm
+4
View File
@@ -7506,6 +7506,10 @@
input_dir = 4;
output_dir = 8
},
/obj/machinery/door/window/westright{
name = "ORM Access";
req_access_txt = "64"
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"aoi" = (
_maps/cit_map_files/PubbyStation/PubbyStation.dmm
+4
View File
@@ -19778,6 +19778,10 @@
input_dir = 4;
output_dir = 8
},
/obj/machinery/door/window/westright{
name = "ORM Access";
req_access_txt = "64"
},
/turf/open/floor/plasteel/dark,
/area/quartermaster/office)
"aWw" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+1822 -170622
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.dmm
+1692 -146208
View File
File diff suppressed because it is too large Load Diff
code/citadel/cit_vendors.dm
+3 -2
View File
@@ -20,7 +20,7 @@
/obj/item/clothing/under/mankini = 1,
/obj/item/dildo/flared/huge = 1
)
premium = list()
premium = list(/obj/item/device/electropack/shockcollar = 1)
refill_canister = /obj/item/vending_refill/kink
/*
/obj/machinery/vending/nazivend
@@ -84,6 +84,7 @@
/obj/item/vending_refill/kink
machine_name = "KinkMate"
icon = 'modular_citadel/icons/vending_restock.dmi'
icon_state = "refill_kink"
charges = list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium
init_charges = list(8, 5, 0)
@@ -98,4 +99,4 @@
machine_name = "sovietvend"
icon_state = "refill_soviet"
charges = list(47, 7, 0)
init_charges = list(47, 7, 0)
init_charges = list(47, 7, 0)
code/modules/cargo/exports/research.dm
-22
View File
@@ -1,22 +0,0 @@
// Sell tech levels
/datum/export/tech
cost = 500
unit_name = "technology data disk"
export_types = list(/obj/item/disk/tech_disk)
var/list/datum/techweb_node/sold_nodes = list()
/datum/export/tech/get_cost(obj/O)
var/obj/item/disk/tech_disk/D = O
var/cost = 0
for(var/V in D.stored_research.researched_nodes)
if(sold_nodes[V]) //Already sold before, don't want it.
continue
var/datum/techweb_node/TWN = D.stored_research.researched_nodes[V]
cost += TWN.export_price
return cost
/datum/export/tech/sell_object(obj/O)
..()
var/obj/item/disk/tech_disk/D = O
for(var/V in D.stored_research.researched_nodes)
sold_nodes[V] = D.stored_research.researched_nodes[V]
code/modules/vore/eating/simple_animal_vr.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/mob/living/simple_animal/verb/toggle_digestion()
set name = "Toggle Animal's Digestion"
set desc = "Enables digestion on this mob for 20 minutes."
set category = "Vore"
set category = "Object"
set src in oview(1)
var/datum/belly/B = vore_organs[vore_selected]
goon/LICENSE.md
+4
View File
@@ -0,0 +1,4 @@
This work is licensed under the Creative Commons
Attribution-NonCommercial-ShareAlike 3.0 United States License. To view a copy
of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/us/ or
send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
goon/README.md
+8
View File
@@ -0,0 +1,8 @@
# Goon-ported-assets
All files excluding this one you're reading right now have been most likely, taken from [goonstation's 2016 release](https://github.com/goonstation/goonstation-2016), unless stated otherwise.
It is very likely that there are modifications to be compatible or on par with our code, however. These changes are licensed under the same license as the other goon files.
## License
See LICENSE.md
html/changelogs/AutoChangeLog-pr-5164.yml
+4
View File
@@ -0,0 +1,4 @@
author: "improvedname"
delete-after: True
changes:
- rscadd: "Adds bz to cargo"
html/changelogs/AutoChangeLog-pr-5168.yml
+6
View File
@@ -0,0 +1,6 @@
author: "ORM Movement"
delete-after: True
changes:
- tweak: "Box Station ORM Moved to 2 tiles south of Cargo Office Door."
- tweak: "Delta Station ORM moved to the southernmost window of Cargo."
- tweak: "Box, Delta, Meta stations now have Windoors with Mineral Storage access blocking them."
html/changelogs/AutoChangeLog-pr-5169.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Improvedname"
delete-after: True
changes:
- rscadd: "You can now get shockcollars from the kinkmate for the price of an coin"
html/changelogs/AutoChangeLog-pr-5171.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Mark9013100"
delete-after: True
changes:
- rscadd: "Cloning data disks can now be constructed after researching the Genetic Engineering technode."
html/changelogs/AutoChangeLog-pr-5177.yml
+4
View File
@@ -0,0 +1,4 @@
author: "deathride58"
delete-after: True
changes:
- tweak: "The toggle animal digestion button has been moved to the object tab. This means observers running byond on low-end hardware will no longer get massive lagspikes when entering a tile adjacent to a simplemob."
html/changelogs/AutoChangeLog-pr-5182.yml
+4
View File
@@ -0,0 +1,4 @@
author: "improvedname"
delete-after: True
changes:
- rscadd: "adds kinkmate refill packages to cargo"
html/changelogs/AutoChangeLog-pr-5184.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Xhuis & Jigsaw"
delete-after: True
changes:
- rscadd: "Traitor clowns can now purchase the reverse bear trap, a disturbing head-mounted execution device, for five telecrystals."
html/changelogs/AutoChangeLog-pr-5192.yml
+4
View File
@@ -0,0 +1,4 @@
author: "CitadelStationBot"
delete-after: True
changes:
- rscadd: "Attention, space explorers! Nothing is out of your reach with the ACME Extendo-Hand (TM)! With it, you can get a WHOLE EXTRA TILE OF REACH! Hug or punch your friends from a whole 3 feet away! Win one from an arcade machine or make one in the Misc. tab of your crafting menu today!"
html/changelogs/AutoChangeLog-pr-5195.yml
+4
View File
@@ -0,0 +1,4 @@
author: "CitadelStationBot"
delete-after: True
changes:
- bugfix: "Blood contracts now only show living players and real names"
html/changelogs/AutoChangeLog-pr-5198.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Denton"
delete-after: True
changes:
- spellcheck: "Fixed Bubblegum's description."
html/changelogs/AutoChangeLog-pr-5200.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Improvedname"
delete-after: True
changes:
- tweak: "adds security skirts to the loadout"
html/changelogs/AutoChangeLog-pr-5209.yml
+5
View File
@@ -0,0 +1,5 @@
author: "Naksu"
delete-after: True
changes:
- rscdel: "Removed actual reagent quadrupling added in #34485"
- rscdel: "Removed the foam effect combining feature, hopefully to be replaced with something less completely and utterly broken"
html/changelogs/AutoChangeLog-pr-5211.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Iamgoofball"
delete-after: True
changes:
- bugfix: "Minor code cleanup on the wirer"
html/changelogs/AutoChangeLog-pr-5212.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Naksu"
delete-after: True
changes:
- bugfix: "Subjects without hearts now display as unsuitable for abductor experiments when probed with the advanced baton."
html/changelogs/AutoChangeLog-pr-5213.yml
+4
View File
@@ -0,0 +1,4 @@
author: "CitadelStationBot"
delete-after: True
changes:
- bugfix: "Turrets now check for borgs. Syndicate turrets are nice to emagged borgs too!"
html/changelogs/AutoChangeLog-pr-5216.yml
+4
View File
@@ -0,0 +1,4 @@
author: "CitadelStationBot"
delete-after: True
changes:
- balance: "nerfs power cells from a insane max possibility"
html/changelogs/AutoChangeLog-pr-5218.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Jittai"
delete-after: True
changes:
- imageadd: "New Horizontal Coffin Sprites"
html/changelogs/AutoChangeLog-pr-5220.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Jittai"
delete-after: True
changes:
- tweak: "Some of the Morgue Trays and Crematoriums on Box, Delta, and Meta have been re-positioned to make use of their new directional states."
icons/mob/head.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 166 KiB

icons/mob/inhands/weapons/melee_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

icons/mob/inhands/weapons/melee_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

icons/obj/closet.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 30 KiB

icons/obj/device.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 39 KiB

icons/obj/items_and_weapons.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 114 KiB

interface/interface.dm
+3 -3
View File
@@ -67,10 +67,10 @@
return
var/static/issue_template = file2text(".github/ISSUE_TEMPLATE.md")
var/servername = CONFIG_GET(string/servername)
var/href = issue_template
var/url_params = "Reporting client version: [byond_version]\n\n[issue_template]"
if(GLOB.round_id || servername)
href = "Issue reported from [GLOB.round_id ? " Round ID: [GLOB.round_id][servername ? " ([servername])" : ""]" : servername]\n\n[issue_template]"
DIRECT_OUTPUT(src, link("[githuburl]/issues/new?body=[url_encode(href)]"))
url_params = "Issue reported from [GLOB.round_id ? " Round ID: [GLOB.round_id][servername ? " ([servername])" : ""]" : servername]\n\n[url_params]"
DIRECT_OUTPUT(src, link("[githuburl]/issues/new?body=[url_encode(url_params)]"))
else
to_chat(src, "<span class='danger'>The Github URL is not set in the server configuration.</span>")
return
modular_citadel/code/modules/cargo/packs.dm
+6
View File
@@ -0,0 +1,6 @@
/datum/supply_pack/misc/kinkmate
name = "Kinkmate supply Crate"
cost = 2000
contraband = TRUE
contains = list(/obj/item/vending_refill/kink)
crate_name = "Kinkmate supply crate"
modular_citadel/code/modules/client/loadout/uniform.dm
+12
View File
@@ -77,3 +77,15 @@
name = "Kilt"
category = slot_w_uniform
path = /obj/item/clothing/under/kilt
/datum/gear/secskirt
name = "Security skirt"
category = slot_w_uniform
path = /obj/item/clothing/under/rank/security/skirt
restricted_roles = list("Security Officer", "Warden", "Head of Security")
/datum/gear/hosskirt
name = "Head of security's skirt"
category = slot_w_uniform
path = /obj/item/clothing/under/rank/head_of_security/skirt
restricted_roles = list("Head of Security")
modular_citadel/icons/vending_restock.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 408 B

modular_citadel/interface/skin.dmf
+282
View File
@@ -0,0 +1,282 @@
macro "default"
menu "menu"
elem
name = "&File"
command = ""
saved-params = "is-checked"
elem
name = "&Quick screenshot\tF2"
command = ".screenshot auto"
category = "&File"
saved-params = "is-checked"
elem
name = "&Save screenshot as...\tShift+F2"
command = ".screenshot"
category = "&File"
saved-params = "is-checked"
elem
name = ""
command = ""
category = "&File"
saved-params = "is-checked"
elem "reconnectbutton"
name = "&Reconnect"
command = ".reconnect"
category = "&File"
saved-params = "is-checked"
elem
name = "&Quit\tAlt-F4"
command = ".quit"
category = "&File"
saved-params = "is-checked"
elem
name = "&Help"
command = ""
saved-params = "is-checked"
elem
name = "&Admin Help\tF1"
command = "adminhelp"
category = "&Help"
saved-params = "is-checked"
elem
name = "&Hotkeys"
command = "hotkeys-help"
category = "&Help"
saved-params = "is-checked"
window "mainwindow"
elem "mainwindow"
type = MAIN
pos = 0,0
size = 640x440
anchor1 = none
anchor2 = none
background-color = #272727
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
icon = 'icons\\ss13_64.png'
macro = "default"
menu = "menu"
elem "split"
type = CHILD
pos = 3,0
size = 634x417
anchor1 = 0,0
anchor2 = 100,100
background-color = #272727
saved-params = "splitter"
left = "mapwindow"
right = "infowindow"
is-vert = true
elem "input"
type = INPUT
pos = 5,420
size = 595x20
anchor1 = 0,100
anchor2 = 100,100
font-size = 10
background-color = #d3b5b5
is-default = true
saved-params = "command"
elem "say"
type = BUTTON
pos = 600,420
size = 37x20
anchor1 = 100,100
anchor2 = none
text-color = #ffffff
background-color = #272727
saved-params = "is-checked"
text = "Chat"
command = ".winset \"say.is-checked=true ? input.command=\"!say \\\"\" : input.command=\""
is-flat = true
button-type = pushbox
elem "asset_cache_browser"
type = BROWSER
pos = 0,0
size = 200x200
anchor1 = none
anchor2 = none
background-color = #272727
is-visible = false
saved-params = ""
elem "tooltip"
type = BROWSER
pos = 0,0
size = 999x999
anchor1 = none
anchor2 = none
background-color = #272727
is-visible = false
saved-params = ""
window "mapwindow"
elem "mapwindow"
type = MAIN
pos = 0,0
size = 640x480
anchor1 = none
anchor2 = none
background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "map"
type = MAP
pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
font-family = "Arial"
font-size = 7
text-color = none
is-default = true
saved-params = "icon-size"
zoom-mode = distort
window "infowindow"
elem "infowindow"
type = MAIN
pos = 0,0
size = 640x480
anchor1 = none
anchor2 = none
background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "info"
type = CHILD
pos = 0,30
size = 640x445
anchor1 = 0,0
anchor2 = 100,100
background-color = #272727
saved-params = "splitter"
left = "statwindow"
right = "outputwindow"
is-vert = false
elem "changelog"
type = BUTTON
pos = 16,5
size = 104x20
anchor1 = 3,0
anchor2 = 19,0
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Changelog"
command = "changelog"
elem "rules"
type = BUTTON
pos = 120,5
size = 100x20
anchor1 = 19,0
anchor2 = 34,0
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Rules"
command = "rules"
elem "wiki"
type = BUTTON
pos = 220,5
size = 100x20
anchor1 = 34,0
anchor2 = 50,0
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Wiki"
command = "wiki"
elem "forum"
type = BUTTON
pos = 320,5
size = 100x20
anchor1 = 50,0
anchor2 = 66,0
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Forum"
command = "forum"
elem "github"
type = BUTTON
pos = 420,5
size = 100x20
anchor1 = 66,0
anchor2 = 81,0
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "GitHub"
command = "github"
elem "report-issue"
type = BUTTON
pos = 520,5
size = 100x20
anchor1 = 81,0
anchor2 = 97,0
font-size = 8
text-color = #ffffff
background-color = #40628a
saved-params = "is-checked"
text = "Report Issue"
command = "report-issue"
window "outputwindow"
elem "outputwindow"
type = MAIN
pos = 0,0
size = 640x480
anchor1 = none
anchor2 = none
background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "browseroutput"
type = BROWSER
pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
background-color = #272727
is-visible = false
is-disabled = true
saved-params = ""
auto-format = false
elem "output"
type = OUTPUT
pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
text-color = #40628a
background-color = #272727
is-default = true
saved-params = ""
window "statwindow"
elem "statwindow"
type = MAIN
pos = 0,0
size = 640x480
anchor1 = none
anchor2 = none
background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "stat"
type = INFO
pos = 0,0
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
text-color = #ffffff
background-color = #383838
is-default = true
saved-params = ""
tab-text-color = #ffffff
tab-background-color = #272727
prefix-color = #ebebeb
suffix-color = #ebebeb
sound/effects/clock_tick.ogg
BIN
View File
Binary file not shown.
sound/machines/beep.ogg
BIN
View File
Binary file not shown.
tgstation.dme
+3 -2
View File
@@ -800,6 +800,7 @@
#include "code\game\objects\items\devices\pipe_painter.dm"
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\pressureplates.dm"
#include "code\game\objects\items\devices\reverse_bear_trap.dm"
#include "code\game\objects\items\devices\scanners.dm"
#include "code\game\objects\items\devices\sensor_device.dm"
#include "code\game\objects\items\devices\taperecorder.dm"
@@ -1318,7 +1319,6 @@
#include "code\modules\cargo\exports\materials.dm"
#include "code\modules\cargo\exports\organs.dm"
#include "code\modules\cargo\exports\parts.dm"
#include "code\modules\cargo\exports\research.dm"
#include "code\modules\cargo\exports\seeds.dm"
#include "code\modules\cargo\exports\sheets.dm"
#include "code\modules\cargo\exports\tools.dm"
@@ -2487,7 +2487,6 @@
#include "interface\interface.dm"
#include "interface\menu.dm"
#include "interface\stylesheet.dm"
#include "interface\skin.dmf"
#include "modular_citadel\cit_medkits.dm"
#include "modular_citadel\cit_screenshake.dm"
#include "modular_citadel\cit_turfs.dm"
@@ -2512,6 +2511,7 @@
#include "modular_citadel\code\game\objects\items\devices\radio\shockcollar.dm"
#include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
#include "modular_citadel\code\modules\cargo\console.dm"
#include "modular_citadel\code\modules\cargo\packs.dm"
#include "modular_citadel\code\modules\client\preferences.dm"
#include "modular_citadel\code\modules\client\preferences_savefile.dm"
#include "modular_citadel\code\modules\client\loadout\_donator.dm"
@@ -2531,4 +2531,5 @@
#include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\life.dm"
#include "modular_citadel\code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "modular_citadel\interface\skin.dmf"
// END_INCLUDE