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

Merge pull request #16 from Citadel-Station-13/master

Browse Source 
asf
This commit is contained in:
dzahlus
2021-05-05 17:23:51 +02:00
committed by GitHub
parent 1542785490 e939ce8c64
commit f5363f4ae7
53 changed files with 1389 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+66 -30
View File
@@ -25957,7 +25957,7 @@
/area/medical/paramedic)
"bkd" = (
/obj/machinery/camera{
c_tag = "Medbay Morgue";
c_tag = "Paramedic Disbatch";
dir = 8;
network = list("ss13","medbay")
},
@@ -26360,7 +26360,7 @@
req_access_txt = "6"
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
/area/maintenance/department/medical/morgue)
"blb" = (
/obj/machinery/door/airlock/command{
name = "Captain's Quarters";
@@ -33974,12 +33974,12 @@
},
/obj/machinery/bloodbankgen,
/obj/machinery/camera{
c_tag = "Medbay Recovery Room";
c_tag = "Medbay Surgery Storage";
dir = 6;
network = list("ss13","medbay")
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bCD" = (
/obj/machinery/computer/operating,
/turf/open/floor/plasteel/white/side,
@@ -34354,11 +34354,14 @@
/area/engineering/storage/tech)
"bDA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bDB" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -34366,6 +34369,9 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -35118,7 +35124,7 @@
dir = 4
},
/turf/closed/wall,
/area/medical/medbay/central)
/area/medical/storage)
"bFn" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -35130,12 +35136,12 @@
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/blood/old,
/obj/machinery/airalarm{
pixel_y = 23
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bFp" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/random,
@@ -35162,8 +35168,11 @@
dir = 8;
sortType = 6
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bFq" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/yellow,
@@ -35187,8 +35196,11 @@
/obj/structure/disposalpipe/segment,
/obj/structure/closet/crate/freezer/surplus_limbs,
/obj/item/reagent_containers/glass/beaker/synthflesh,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bFu" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -35222,8 +35234,9 @@
"bFx" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/limbgrower,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"bFy" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -35809,7 +35822,7 @@
dir = 4
},
/turf/closed/wall,
/area/medical/medbay/central)
/area/medical/storage)
"bGR" = (
/obj/structure/table,
/obj/item/storage/belt/medical{
@@ -35860,11 +35873,9 @@
/area/medical/medbay/central)
"bGW" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/closed/wall,
/area/medical/medbay/central)
/area/medical/storage)
"bGX" = (
/obj/machinery/light{
dir = 8
@@ -37012,7 +37023,7 @@
dir = 9
},
/turf/closed/wall,
/area/medical/medbay/central)
/area/medical/storage)
"bJB" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
/turf/open/floor/plasteel,
@@ -52309,7 +52320,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/science/robotics/mechbay)
/area/maintenance/department/medical/morgue)
"cHF" = (
/obj/machinery/button/door{
id = "Skynet_launch";
@@ -54428,7 +54439,7 @@
"fvk" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/medical/medbay/central)
/area/medical/storage)
"fvY" = (
/obj/machinery/computer/cryopod{
pixel_y = 26
@@ -55768,6 +55779,9 @@
req_access_txt = "45"
},
/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/medical/surgery)
"iVJ" = (
@@ -60411,6 +60425,9 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engineering/atmos)
"tBV" = (
/turf/closed/wall,
/area/medical/storage)
"tCa" = (
/obj/structure/table/wood,
/obj/item/instrument/guitar{
@@ -61009,8 +61026,17 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
areastring = "/area/medical/storage";
name = "Medbay Surgery Storage";
pixel_x = 1;
pixel_y = -24
},
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
/area/medical/storage)
"uFZ" = (
/obj/structure/closet/emcloset,
/obj/effect/turf_decal/stripes/line{
@@ -61336,6 +61362,16 @@
/obj/structure/pool/Lboard,
/turf/open/pool,
/area/commons/fitness/pool)
"voZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/white,
/area/medical/storage)
"vpY" = (
/obj/structure/closet/lasertag/blue,
/obj/item/clothing/under/misc/pj/blue,
@@ -95226,10 +95262,10 @@ aJq
bHt
bBz
bzs
bof
tBV
bFm
bGI
bof
tBV
cBD
bKD
bLO
@@ -95483,7 +95519,7 @@ bwu
kPj
bBB
eBX
bof
tBV
bFp
uFV
fvk
@@ -95740,7 +95776,7 @@ aJq
bAj
aJq
aKG
bof
tBV
bFo
bDA
bFt
@@ -95997,9 +96033,9 @@ byX
aXh
bmE
bCA
bof
tBV
bCC
bDA
voZ
bFx
bGW
bKI
_maps/map_files/Deltastation/DeltaStation2.dmm
+10 -7
View File
@@ -13232,7 +13232,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
/area/maintenance/port/fore)
"aYA" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -33522,7 +33522,7 @@
dir = 1
},
/turf/open/floor/plasteel,
/area/security/range)
/area/maintenance/starboard)
"cqi" = (
/obj/structure/cable/white,
/obj/effect/spawner/structure/window/reinforced,
@@ -49101,7 +49101,7 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/science/misc_lab)
/area/maintenance/port)
"dhU" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall/r_wall,
@@ -71534,6 +71534,9 @@
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/hos)
"emZ" = (
/turf/closed/wall,
/area/hallway/primary/port)
"enl" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/corner,
@@ -106478,7 +106481,7 @@
dir = 1
},
/turf/open/floor/plasteel,
/area/commons/dorms)
/area/maintenance/starboard)
"qtk" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
@@ -156429,7 +156432,7 @@ pzz
kRu
iio
aMN
alf
emZ
bqm
bsp
bug
@@ -156686,7 +156689,7 @@ vgS
xnz
iio
aMO
alf
emZ
bqn
bsq
buh
@@ -156943,7 +156946,7 @@ lNq
skw
iio
aMN
alf
emZ
bqo
bsr
fzc
_maps/map_files/MetaStation/MetaStation.dmm
+309 -92
View File
@@ -25521,6 +25521,9 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/item/paicard{
pixel_x = -8
},
/turf/open/floor/plasteel/white,
/area/science/research)
"cav" = (
@@ -44287,6 +44290,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cRW" = (
@@ -44298,10 +44304,13 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"cRX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cRY" = (
@@ -44313,6 +44322,7 @@
name = "test chamber blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"cRZ" = (
@@ -44325,6 +44335,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"cSa" = (
@@ -44395,10 +44408,12 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"cSi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSj" = (
@@ -44429,6 +44444,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSm" = (
@@ -44443,6 +44461,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSn" = (
@@ -44474,10 +44495,16 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cSr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSs" = (
@@ -44489,6 +44516,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSt" = (
@@ -44507,6 +44537,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cSw" = (
@@ -44520,6 +44553,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSx" = (
@@ -44537,16 +44573,6 @@
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/science/xenobiology)
"cSA" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSB" = (
/obj/structure/table/reinforced,
/obj/machinery/button/door{
@@ -44564,6 +44590,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSD" = (
@@ -44576,6 +44605,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"cSE" = (
@@ -44625,10 +44657,12 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSL" = (
@@ -44641,6 +44675,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cSM" = (
@@ -44655,6 +44690,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSN" = (
@@ -44672,6 +44710,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cSO" = (
@@ -44683,6 +44724,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSP" = (
@@ -44705,6 +44749,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cSR" = (
@@ -44718,6 +44765,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSS" = (
@@ -44737,6 +44787,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cST" = (
@@ -44756,6 +44809,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cSV" = (
@@ -44803,6 +44859,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cTa" = (
@@ -44823,6 +44880,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTc" = (
@@ -44840,18 +44900,14 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cTe" = (
/obj/machinery/door/window/northleft{
base_state = "right";
dir = 8;
icon_state = "right";
name = "Containment Pen #6";
req_access_txt = "55"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -44868,6 +44924,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"cTj" = (
@@ -44952,6 +45011,7 @@
},
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTs" = (
@@ -44993,6 +45053,7 @@
/obj/item/clothing/glasses/science,
/obj/structure/table,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cTA" = (
@@ -45057,6 +45118,9 @@
icon_state = "1-2"
},
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cUN" = (
@@ -45092,6 +45156,7 @@
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"cVd" = (
@@ -45549,6 +45614,7 @@
/area/science/xenobiology)
"daC" = (
/obj/structure/sign/warning/electricshock,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"daD" = (
@@ -46190,6 +46256,9 @@
/area/science/xenobiology)
"dcy" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcz" = (
@@ -46204,8 +46273,8 @@
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
@@ -46355,6 +46424,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcR" = (
@@ -46366,6 +46438,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"dcS" = (
@@ -46416,6 +46491,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"dcW" = (
@@ -46427,6 +46505,9 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"dcX" = (
@@ -46439,16 +46520,21 @@
name = "containment blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plating,
/area/science/xenobiology)
"dcY" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dcZ" = (
@@ -46473,6 +46559,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"ddb" = (
@@ -46680,6 +46767,7 @@
name = "test chamber blast door"
},
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/science/xenobiology)
"ddx" = (
@@ -49268,6 +49356,9 @@
/area/hallway/secondary/exit/departure_lounge)
"dDI" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"dDJ" = (
@@ -50813,6 +50904,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/commons/fitness/recreation)
"ezU" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"eAd" = (
/obj/machinery/door/airlock/highsecurity{
name = "Secure Tech Storage";
@@ -53466,6 +53565,13 @@
},
/turf/open/floor/wood,
/area/service/theater)
"ggU" = (
/obj/machinery/atmospherics/components/binary/pump/on{
dir = 8;
name = "Air to Distro"
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"ghb" = (
/turf/open/floor/plating,
/area/engineering/main)
@@ -54416,6 +54522,12 @@
},
/turf/open/floor/plasteel,
/area/security/office)
"gLN" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/engine,
/area/science/xenobiology)
"gLV" = (
/obj/machinery/vending/boozeomat,
/obj/machinery/light/small{
@@ -54653,6 +54765,12 @@
/obj/item/clothing/under/suit/tan,
/turf/open/floor/carpet,
/area/commons/dorms)
"gTs" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/turf/open/floor/engine,
/area/science/xenobiology)
"gTN" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -54780,6 +54898,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"gZF" = (
@@ -56618,6 +56739,12 @@
"icE" = (
/turf/closed/wall,
/area/security/office)
"idm" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"idx" = (
/obj/structure/cable/yellow{
icon_state = "2-8"
@@ -57339,6 +57466,11 @@
"izZ" = (
/turf/open/floor/engine/n2o,
/area/engineering/atmos)
"iAD" = (
/obj/structure/sign/warning/electricshock,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/science/xenobiology)
"iAK" = (
/obj/structure/window/reinforced,
/obj/effect/turf_decal/tile/red{
@@ -57465,6 +57597,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"iFq" = (
@@ -57642,6 +57777,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/nuke_storage)
"iIk" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"iIJ" = (
/obj/item/instrument/violin,
/obj/structure/table/wood,
@@ -58602,6 +58743,12 @@
},
/turf/open/floor/plasteel,
/area/service/bar)
"jqj" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/turf/open/floor/engine,
/area/science/xenobiology)
"jra" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -60102,6 +60249,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
"kje" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 8;
name = "Xenobiology air connection"
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"kjA" = (
/obj/item/clothing/gloves/color/yellow,
/obj/item/clothing/gloves/color/yellow,
@@ -61593,6 +61747,12 @@
dir = 5
},
/area/service/kitchen)
"lbz" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"lbV" = (
/obj/item/folder/white{
pixel_x = 4;
@@ -61817,6 +61977,12 @@
},
/turf/open/floor/plasteel,
/area/service/hydroponics/garden)
"lhY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/engine,
/area/science/xenobiology)
"lix" = (
/obj/structure/window/reinforced{
dir = 1
@@ -63138,6 +63304,12 @@
dir = 1
},
/area/engineering/atmos)
"lYC" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"lYW" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -65516,6 +65688,16 @@
},
/turf/open/floor/plating,
/area/commons/fitness/pool)
"nBJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"nBX" = (
/obj/structure/table/wood,
/obj/item/paper_bin{
@@ -65813,6 +65995,10 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/wood,
/area/service/library)
"nPc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall,
/area/science/xenobiology)
"nPf" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -70934,10 +71120,10 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"qID" = (
@@ -73737,11 +73923,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
"spO" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/turf/open/floor/plating,
/area/engineering/atmos)
"spZ" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/chapel,
@@ -74083,7 +74264,7 @@
},
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/science/circuit)
/area/maintenance/starboard/aft)
"sFR" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -75259,6 +75440,10 @@
dir = 5
},
/area/service/kitchen)
"tpE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/engine,
/area/science/xenobiology)
"tpO" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -76385,7 +76570,7 @@
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/service/library)
/area/maintenance/port)
"ubJ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
@@ -76672,13 +76857,18 @@
},
/turf/open/floor/wood,
/area/service/library)
"uiZ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/science/xenobiology)
"ujb" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/turf/open/floor/plasteel,
/area/engineering/gravity_generator)
"ujE" = (
@@ -78596,6 +78786,13 @@
/obj/effect/landmark/start/atmospheric_technician,
/turf/open/floor/plasteel,
/area/engineering/atmos)
"vzs" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/mob/living/simple_animal/slime,
/turf/open/floor/engine,
/area/science/xenobiology)
"vzO" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -78997,6 +79194,10 @@
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"vNv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/science/xenobiology)
"vNx" = (
/obj/machinery/computer/security,
/obj/machinery/computer/security/telescreen{
@@ -80256,7 +80457,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/commons/vacant_room/office)
/area/maintenance/port)
"wxP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -81536,6 +81737,12 @@
},
/turf/open/floor/plasteel,
/area/commons/toilet/auxiliary)
"xjK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"xjY" = (
/obj/machinery/holopad,
/turf/open/floor/wood,
@@ -82347,6 +82554,12 @@
dir = 1
},
/area/engineering/atmos)
"xGQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/engine,
/area/science/xenobiology)
"xGS" = (
/obj/structure/window/reinforced{
dir = 8
@@ -82429,6 +82642,10 @@
},
/turf/open/floor/plasteel,
/area/cargo/storage)
"xIL" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/engine,
/area/science/xenobiology)
"xJf" = (
/obj/structure/window/reinforced{
dir = 8
@@ -97479,8 +97696,8 @@ dne
aip
dne
dne
dne
dne
aRA
aRA
dne
baf
bbK
@@ -116070,16 +116287,16 @@ cRi
cRe
cRi
cSg
cSn
cSn
lbz
xjK
cSd
cSg
cSn
cSn
lbz
xjK
cSd
cSg
cSn
cSn
lbz
xjK
cRi
cTA
cTn
@@ -116327,16 +116544,16 @@ cRi
cRD
cSd
cSg
cSn
cSn
xGQ
iIk
cSd
cSg
cSn
cSn
xGQ
iIk
cSd
cSg
cSn
cSn
xGQ
iIk
cRi
cRi
cTq
@@ -116851,14 +117068,14 @@ cSI
cSj
cTb
cST
cSd
nPc
cSL
cVa
cTr
cRY
daC
cSn
cSn
xIL
lhY
cSn
cRi
dmq
@@ -117099,11 +117316,11 @@ dcG
cSe
cSi
cSr
cSA
dcY
cSG
cSK
cSr
cSA
dcY
cSW
cSK
cSr
@@ -117355,15 +117572,15 @@ cRk
dcH
cSf
cSl
cSJ
uiZ
cSa
cSJ
cSJ
nBJ
cUM
cUN
cSJ
cSJ
cSJ
nBJ
uiZ
cSV
cSJ
cSX
@@ -117879,14 +118096,14 @@ cSI
dcV
cTe
dda
cSd
vNv
cSZ
ddn
ezU
cTz
ddv
daC
cSn
cSn
iAD
tpE
gTs
daN
cRi
dmr
@@ -118121,8 +118338,8 @@ aaa
cRi
doj
dcp
cSt
cSt
idm
lYC
dcK
cSd
cRW
@@ -118382,16 +118599,16 @@ dcy
cSt
dcL
cSd
cSn
cSn
iIk
xGQ
cSg
cSd
cSn
cSn
iIk
xGQ
cSg
cSd
cSn
cSn
iIk
xGQ
cSg
cRi
cRi
@@ -118635,20 +118852,20 @@ aaa
cRi
dce
cSt
cSt
ggU
dcC
dcM
cSd
cSn
cSn
iIk
gLN
cSg
cSd
cSn
cSn
iIk
gLN
cSg
cSd
cSn
cSn
iIk
gLN
cSg
cRi
ddh
@@ -118892,19 +119109,19 @@ aaa
cRi
dcf
dcr
dcr
kje
dcD
dcN
cSd
cSn
jqj
cSx
cSF
cSd
cSy
vzs
dbp
cSF
cSd
cSn
jqj
dbt
cSF
cRi
@@ -125272,7 +125489,7 @@ mMn
mMn
iAK
tie
spO
rid
cfw
mTL
ilE
@@ -125726,7 +125943,7 @@ mNX
xXs
pHX
qIq
kCp
jgc
gZo
nPJ
kCp
@@ -126300,7 +126517,7 @@ mMn
tSa
guR
elE
spO
rid
cfw
mTL
ygg
_maps/map_files/PubbyStation/PubbyStation.dmm
+35 -27
View File
@@ -705,7 +705,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/commons/fitness/pool)
/area/maintenance/department/crew_quarters/dorms)
"abG" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -3392,6 +3392,10 @@
/obj/vehicle/ridden/secway,
/obj/item/key/security,
/obj/effect/turf_decal/bot,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/office)
"ais" = (
@@ -4891,6 +4895,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/airalarm{
dir = 4;
pixel_x = -23
},
/turf/open/floor/plasteel,
/area/security/brig)
"alz" = (
@@ -37279,7 +37287,7 @@
dir = 4
},
/turf/open/floor/plating,
/area/science/mixing)
/area/maintenance/department/science)
"bGB" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -45936,14 +45944,8 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"bZV" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
req_access_txt = "13"
},
/turf/open/floor/plating,
/area/maintenance/department/cargo)
/turf/closed/wall,
/area/hallway/primary/fore)
"bZY" = (
/turf/closed/wall,
/area/service/chapel/office)
@@ -61261,8 +61263,14 @@
/turf/open/floor/plating,
/area/maintenance/department/science)
"vtT" = (
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/machinery/door/airlock/external{
req_access_txt = "13"
},
/turf/open/floor/plating,
/area/maintenance/solars/port)
/area/maintenance/department/cargo)
"vuP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -62179,7 +62187,7 @@
"xuv" = (
/obj/item/broken_bottle,
/turf/open/floor/plating,
/area/maintenance/solars/port)
/area/maintenance/department/security/brig)
"xvO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -79788,11 +79796,11 @@ atp
aus
aiu
wxb
axC
aiu
xuv
azN
vtT
vtT
aoe
ajD
ajD
aiu
apB
aiu
@@ -82360,8 +82368,8 @@ apE
avq
apE
ajM
aiu
aiu
bZV
bZV
gSH
xJy
sJr
@@ -106255,7 +106263,7 @@ aaF
aaF
aaF
abF
aaF
aiS
aiS
atn
awC
@@ -107807,8 +107815,8 @@ aaa
aaa
aaa
aaa
aEl
aFi
aEj
vtT
aEj
aaa
aEj
@@ -108064,9 +108072,9 @@ aaa
aaa
aaa
aaa
aEj
bZV
aEj
cdm
cdm
cdm
aaa
aaa
aaa
@@ -108321,9 +108329,9 @@ aaa
aaa
aaa
aaa
ahi
ahi
ahi
bBW
bBW
bBW
aaa
aaa
aaa
code/__DEFINES/_flags/item_flags.dm
+1
View File
@@ -51,3 +51,4 @@
#define ORGAN_NO_SPOIL (1<<5) //Do not spoil under any circumstances
#define ORGAN_NO_DISMEMBERMENT (1<<6) //Immune to disembowelment.
#define ORGAN_EDIBLE (1<<7) //is a snack? :D
#define ORGAN_SYNTHETIC_EMP (1<<6) //Synthetic organ affected by an EMP. Deteriorates over time.
code/__DEFINES/layers_planes.dm
+1
View File
@@ -77,6 +77,7 @@
#define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible
#define TABLE_LAYER 2.8
#define TRAY_LAYER 2.85
#define GATEWAY_UNDERLAY_LAYER 2.85
#define BELOW_OBJ_LAYER 2.9
#define LOW_ITEM_LAYER 2.95
//#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define
code/__HELPERS/global_lists.dm
+1
View File
@@ -68,6 +68,7 @@
for(var/spath in subtypesof(/datum/species))
var/datum/species/S = new spath()
GLOB.species_list[S.id] = spath
GLOB.species_datums[S.id] = S
//Surgeries
for(var/path in subtypesof(/datum/surgery))
code/__HELPERS/mobs.dm
+2
View File
@@ -320,6 +320,8 @@ GLOBAL_LIST_INIT(nonstandard_skin_tones, list("orange"))
GLOBAL_LIST_EMPTY(species_list)
GLOBAL_LIST_EMPTY(species_datums)
/proc/age2agedescription(age)
switch(age)
if(0 to 1)
code/__HELPERS/reagents.dm
+6
View File
@@ -95,3 +95,9 @@
if("I'm feeling lucky")
chosen_id = pick(subtypesof(/datum/reagent))
return chosen_id
/proc/find_reagent_object_from_type(input)
if(GLOB.chemical_reagents_list[input]) //prefer IDs!
return GLOB.chemical_reagents_list[input]
else
return null
code/controllers/subsystem/activity.dm
+2 -2
View File
@@ -61,14 +61,14 @@ SUBSYSTEM_DEF(activity)
for(var/threat in threat_history)
. = max(threat_history[threat], .)
/datum/controller/subsystem/activity/proc/on_explosion(atom/epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range)
/datum/controller/subsystem/activity/proc/on_explosion(datum/source, atom/epicenter, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range)
if(!("explosions" in deferred_threats))
deferred_threats["explosions"] = 0
var/area/A = get_area(epicenter)
if(is_station_level(epicenter.z) && (A.area_flags & BLOBS_ALLOWED) && !istype(A, /area/asteroid))
deferred_threats["explosions"] += devastation_range**2 + heavy_impact_range**2 / 4 + light_impact_range**2 / 8 // 75 for a maxcap
/datum/controller/subsystem/activity/proc/on_death(mob/M, gibbed)
/datum/controller/subsystem/activity/proc/on_death(datum/source, mob/M, gibbed)
if(!("crew_deaths" in deferred_threats))
deferred_threats["crew_deaths"] = 0
if(M?.mind && SSjob.GetJob(M.mind.assigned_role))
code/datums/mutations/space_adaptation.dm
+1 -1
View File
@@ -11,7 +11,7 @@
/datum/mutation/human/space_adaptation/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
..()
if(!(type in visual_indicators))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "fire", -MUTATIONS_LAYER))
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "space_adapt", -MUTATIONS_LAYER))
/datum/mutation/human/space_adaptation/get_visual_indicator()
return visual_indicators[type][1]
code/game/machinery/limbgrower.dm
+234 -195
View File
@@ -1,9 +1,5 @@
#define LIMBGROWER_MAIN_MENU 1
#define LIMBGROWER_CATEGORY_MENU 2
#define LIMBGROWER_CHEMICAL_MENU 3
//use these for the menu system
/// The limbgrower. Makes organd and limbs with synthflesh and chems.
/// See [limbgrower_designs.dm] for everything we can make.
/obj/machinery/limbgrower
name = "limb grower"
desc = "It grows new limbs using Synthflesh."
@@ -15,161 +11,235 @@
active_power_usage = 100
circuit = /obj/item/circuitboard/machine/limbgrower
var/operating = FALSE
var/disabled = FALSE
/// The category of limbs we're browing in our UI.
var/selected_category = "human"
/// If we're currently printing something.
var/busy = FALSE
var/prod_coeff = 1
/// How efficient our machine is. Better parts = less chemicals used and less power used. Range of 1 to 0.25.
var/production_coefficient = 1
/// How long it takes for us to print a limb. Affected by production_coefficient.
var/production_speed = 3 SECONDS
/// The design we're printing currently.
var/datum/design/being_built
/// Our internal techweb for limbgrower designs.
var/datum/techweb/stored_research
var/selected_category
var/screen = 1
/// All the categories of organs we can print.
var/list/categories = list(
"human" = /datum/species/human,
"lizard" = /datum/species/lizard,
"mammal" = /datum/species/mammal,
"insect" = /datum/species/insect,
"fly" = /datum/species/fly,
"plasmaman" = /datum/species/plasmaman,
"xeno" = /datum/species/xeno,
"other" = /datum/species,
)
var/list/stored_species = list()
"human",
"lizard",
"mammal",
"insect",
"fly",
"plasmaman",
"xeno",
"other",
)
var/obj/item/disk/data/dna_disk
/obj/machinery/limbgrower/Initialize()
create_reagents(100, OPENCONTAINER)
stored_research = new /datum/techweb/specialized/autounlocking/limbgrower
for(var/i in categories)
var/species = categories[i]
stored_species[i] = new species()
. = ..()
AddComponent(/datum/component/plumbing/simple_demand)
AddComponent(/datum/component/simple_rotation, ROTATION_WRENCH | ROTATION_CLOCKWISE, null, CALLBACK(src, .proc/can_be_rotated))
/obj/machinery/limbgrower/ui_interact(mob/user)
/obj/machinery/limbgrower/ui_interact(mob/user, datum/tgui/ui)
. = ..()
if(!is_operational())
return
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Limbgrower", src)
ui.open()
var/dat = main_win(user)
/obj/machinery/limbgrower/ui_data(mob/user)
var/list/data = list()
switch(screen)
if(LIMBGROWER_MAIN_MENU)
dat = main_win(user)
if(LIMBGROWER_CATEGORY_MENU)
dat = category_win(user,selected_category)
if(LIMBGROWER_CHEMICAL_MENU)
dat = chemical_win(user)
for(var/datum/reagent/reagent_id in reagents.reagent_list)
var/list/reagent_data = list(
reagent_name = reagent_id.name,
reagent_amount = reagent_id.volume,
reagent_type = reagent_id.type
)
data["reagents"] += list(reagent_data)
var/datum/browser/popup = new(user, "Limb Grower", name, 400, 500)
popup.set_content(dat)
popup.open()
data["total_reagents"] = reagents.total_volume
data["max_reagents"] = reagents.maximum_volume
data["busy"] = busy
var/list/disk_data = list()
disk_data["disk"] = dna_disk //Do i, the machine, have a disk?
disk_data["name"] = dna_disk?.fields["name"] //Name for the human saved if there is one
data["disk"] = disk_data
return data
/obj/machinery/limbgrower/ui_static_data(mob/user)
var/list/data = list()
data["categories"] = list()
var/species_categories = categories.Copy()
for(var/species in species_categories)
species_categories[species] = list()
for(var/design_id in stored_research.researched_designs)
var/datum/design/limb_design = SSresearch.techweb_design_by_id(design_id)
for(var/found_category in species_categories)
if(found_category in limb_design.category)
species_categories[found_category] += limb_design
for(var/category in species_categories)
var/list/category_data = list(
name = category,
designs = list(),
)
for(var/datum/design/found_design in species_categories[category])
var/list/all_reagents = list()
for(var/reagent_typepath in found_design.reagents_list)
var/datum/reagent/reagent_id = find_reagent_object_from_type(reagent_typepath)
var/list/reagent_data = list(
name = reagent_id.name,
amount = (found_design.reagents_list[reagent_typepath] * production_coefficient),
)
all_reagents += list(reagent_data)
category_data["designs"] += list(list(
parent_category = category,
name = found_design.name,
id = found_design.id,
needed_reagents = all_reagents,
))
data["categories"] += list(category_data)
return data
/obj/machinery/limbgrower/on_deconstruction()
for(var/obj/item/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
for(var/obj/item/reagent_containers/glass/our_beaker in component_parts)
reagents.trans_to(our_beaker, our_beaker.reagents.maximum_volume)
..()
/obj/machinery/limbgrower/attackby(obj/item/O, mob/user, params)
if(busy)
/obj/machinery/limbgrower/attackby(obj/item/user_item, mob/living/user, params)
if (busy)
to_chat(user, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
return
if(default_deconstruction_screwdriver(user, "limbgrower_panelopen", "limbgrower_idleoff", O))
updateUsrDialog()
if(default_deconstruction_screwdriver(user, "limbgrower_panelopen", "limbgrower_idleoff", user_item))
ui_close(user)
return
if(panel_open && default_deconstruction_crowbar(O))
return
if(user.a_intent == INTENT_HARM) //so we can hit the machine
if(user_item.tool_behaviour == TOOL_WRENCH && panel_open)
return ..()
if(istype(O, /obj/item/disk))
if(panel_open && default_deconstruction_crowbar(user_item))
return
if(istype(user_item, /obj/item/disk))
if(dna_disk)
to_chat(user, "<span class='warning'>\The [src] already has a dna disk, take it out first!</span>")
return
else
O.forceMove(src)
dna_disk = O
to_chat(user, "<span class='notice'>You insert \the [O] into \the [src].</span>")
user_item.forceMove(src)
dna_disk = user_item
to_chat(user, "<span class='notice'>You insert \the [user_item] into \the [src].</span>")
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
return
/obj/machinery/limbgrower/Topic(href, href_list)
if(..())
if(user.a_intent != INTENT_HELP)
return ..()
/obj/machinery/limbgrower/proc/can_be_rotated()
if(panel_open)
return TRUE
return FALSE
/obj/machinery/limbgrower/ui_act(action, list/params)
. = ..()
if(.)
return
if (!busy)
if(href_list["menu"])
screen = text2num(href_list["menu"])
if(href_list["category"])
selected_category = href_list["category"]
if (busy)
to_chat(usr, "<span class='danger'>\The [src] is busy. Please wait for completion of previous operation.</span>")
return
if(href_list["disposeI"]) //Get rid of a reagent incase you add the wrong one by mistake
reagents.del_reagent(text2path(href_list["disposeI"]))
switch(action)
if(href_list["make"])
if("empty_reagent")
reagents.del_reagent(text2path(params["reagent_type"]))
. = TRUE
/////////////////
//href protection
being_built = stored_research.isDesignResearchedID(href_list["make"]) //check if it's a valid design
if("eject_disk")
eject_disk(usr)
if("make_limb")
being_built = stored_research.isDesignResearchedID(params["design_id"])
if(!being_built)
return
CRASH("[src] was passed an invalid design id!")
/// All the reagents we're using to make our organ.
var/list/consumed_reagents_list = being_built.reagents_list.Copy()
/// The amount of power we're going to use, based on how much reagent we use.
var/power = 0
var/synth_cost = being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff
var/power = max(2000, synth_cost/5)
for(var/reagent_id in consumed_reagents_list)
consumed_reagents_list[reagent_id] *= production_coefficient
if(!reagents.has_reagent(reagent_id, consumed_reagents_list[reagent_id]))
audible_message("<span class='notice'>\The [src] buzzes.</span>")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
return
if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff))
busy = TRUE
use_power(power)
flick("limbgrower_fill",src)
icon_state = "limbgrower_idleon"
addtimer(CALLBACK(src, .proc/build_item),32*prod_coeff)
power = max(2000, (power + consumed_reagents_list[reagent_id]))
if(href_list["dna_disk"])
var/mob/living/carbon/user = usr
if(istype(user))
if(!dna_disk)
var/obj/item/disk/diskette = user.get_active_held_item()
if(istype(diskette))
diskette.forceMove(src)
dna_disk = diskette
to_chat(user, "<span class='notice'>You insert \the [diskette] into \the [src].</span>")
else
dna_disk.forceMove(src.loc)
user.put_in_active_hand(dna_disk)
to_chat(user, "<span class='notice'>You remove \the [dna_disk] from \the [src].</span>")
dna_disk = null
else
to_chat(user, "<span class='warning'>You are unable to grasp \the [dna_disk] disk from \the [src].</span>")
else
to_chat(usr, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
busy = TRUE
use_power(power)
flick("limbgrower_fill",src)
icon_state = "limbgrower_idleon"
selected_category = params["active_tab"]
addtimer(CALLBACK(src, .proc/build_item, consumed_reagents_list), production_speed * production_coefficient)
. = TRUE
updateUsrDialog()
return
/obj/machinery/limbgrower/proc/build_item()
if(reagents.has_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)) //sanity check, if this happens we are in big trouble
reagents.remove_reagent(/datum/reagent/medicine/synthflesh, being_built.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)
var/buildpath = being_built.build_path
if(ispath(buildpath, /obj/item/bodypart)) //This feels like spaghetti code, but i need to initiliaze a limb somehow
build_limb(buildpath)
else if(ispath(buildpath, /obj/item/organ/genital)) //genitals are uhh... customizable
build_genital(buildpath)
else
//Just build whatever it is
new buildpath(loc)
else
src.visible_message("<span class=\"error\"> Something went very wrong and there isnt enough synthflesh anymore!</span>")
busy = FALSE
flick("limbgrower_unfill",src)
icon_state = "limbgrower_idleoff"
updateUsrDialog()
/*
* The process of beginning to build a limb or organ.
* Goes through and sanity checks that we actually have enough reagent to build our item.
* Then, remove those reagents from our reagents datum.
*
* After the reagents are handled, we can proceede with making the limb or organ. (Limbs are handled in a separate proc)
*
* modified_consumed_reagents_list - the list of reagents we will consume on build, modified by the production coefficient.
*/
/obj/machinery/limbgrower/proc/build_item(list/modified_consumed_reagents_list)
for(var/reagent_id in modified_consumed_reagents_list)
if(!reagents.has_reagent(reagent_id, modified_consumed_reagents_list[reagent_id]))
audible_message("<span class='notice'>\The [src] buzzes.</span>")
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
break
/obj/machinery/limbgrower/proc/build_limb(buildpath)
reagents.remove_reagent(reagent_id, modified_consumed_reagents_list[reagent_id])
var/built_typepath = being_built.build_path
// If we have a bodypart, we need to initialize the limb on its own. Otherwise we can build it here.
if(ispath(built_typepath, /obj/item/bodypart))
build_limb(built_typepath)
else if(ispath(built_typepath, /obj/item/organ/genital)) //genitals are uhh... customizable
build_genital(built_typepath)
else
new built_typepath(loc)
busy = FALSE
flick("limbgrower_unfill", src)
icon_state = "limbgrower_idleoff"
/*
* The process of putting together a limb.
* This is called from after we remove the reagents, so this proc is just initializing the limb type.
*
* This proc handles skin / mutant color, greyscaling, names and descriptions, and various other limb creation steps.
*
* built_typepath - the path of the bodypart we're building.
*/
/obj/machinery/limbgrower/proc/build_limb(built_typepath)
//i need to create a body part manually using a set icon (otherwise it doesnt appear)
var/obj/item/bodypart/limb
var/datum/species/selected = stored_species[selected_category]
limb = new buildpath(loc)
var/datum/species/selected = GLOB.species_datums[selected_category]
limb = new built_typepath(loc)
limb.base_bp_icon = selected.icon_limbs || DEFAULT_BODYPART_ICON_ORGANIC
limb.species_id = selected.limbs_id
limb.color_src = (MUTCOLORS in selected.species_traits ? MUTCOLORS : (selected.use_skintones ? SKINTONE : FALSE))
@@ -189,135 +259,103 @@
BP.name = "\improper synthetic [lowertext(selected.name)] [limb.name]"
BP.desc = "A synthetic [selected_category] limb that will morph on its first use in surgery. This one is for the [parse_zone(limb.body_zone)]."
/obj/machinery/limbgrower/proc/build_genital(buildpath)
/*
* Builds genitals, modifies to be the same
* as the person's cloning data on the data disk
*/
/obj/machinery/limbgrower/proc/build_genital(built_typepath)
//i needed to create a way to customize gene tools using dna
var/list/features = dna_disk?.fields["features"]
if(length(features))
switch(buildpath)
switch(built_typepath)
if(/obj/item/organ/genital/penis)
var/obj/item/organ/genital/penis/penis = new(loc)
if(features["has_cock"])
penis.shape = features["cock_shape"]
penis.length = features["cock_shape"]
penis.diameter_ratio = features["cock_diameter_ratio"]
penis.color = sanitize_hexcolor(features["cock_color"], 6)
penis.update_icon()
penis.color = sanitize_hexcolor(features["cock_color"], 6, TRUE)
penis.update()
if(/obj/item/organ/genital/testicles)
var/obj/item/organ/genital/testicles/balls = new(loc)
if(features["has_balls"])
balls.color = sanitize_hexcolor(features["balls_color"], 6)
balls.color = sanitize_hexcolor(features["balls_color"], 6, TRUE)
balls.shape = features["balls_shape"]
balls.size = features["balls_size"]
balls.fluid_rate = features["balls_cum_rate"]
balls.fluid_mult = features["balls_cum_mult"]
balls.fluid_efficiency = features["balls_efficiency"]
balls.update()
if(/obj/item/organ/genital/vagina)
var/obj/item/organ/genital/vagina/vegana = new(loc)
if(features["has_vagina"])
vegana.color = sanitize_hexcolor(features["vag_color"], 6)
if(features["has_vag"])
vegana.color = sanitize_hexcolor(features["vag_color"], 6, TRUE)
vegana.shape = features["vag_shape"]
vegana.update()
if(/obj/item/organ/genital/breasts)
var/obj/item/organ/genital/breasts/boobs = new(loc)
if(features["has_breasts"])
boobs.color = sanitize_hexcolor(features["breasts_color"], 6)
boobs.color = sanitize_hexcolor(features["breasts_color"], 6, TRUE)
boobs.size = features["breasts_size"]
boobs.shape = features["breasts_shape"]
if(!features["breasts_producing"])
boobs.genital_flags &= ~(GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)
boobs.update()
else
new buildpath(loc)
new built_typepath(loc)
else
new buildpath(loc)
new built_typepath(loc)
/obj/machinery/limbgrower/RefreshParts()
reagents.maximum_volume = 0
for(var/obj/item/reagent_containers/glass/G in component_parts)
reagents.maximum_volume += G.volume
G.reagents.trans_to(src, G.reagents.total_volume)
var/T=1.2
for(var/obj/item/stock_parts/manipulator/M in component_parts)
T -= M.rating*0.2
prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4
for(var/obj/item/reagent_containers/glass/our_beaker in component_parts)
reagents.maximum_volume += our_beaker.volume
our_beaker.reagents.trans_to(src, our_beaker.reagents.total_volume)
production_coefficient = 1.2
for(var/obj/item/stock_parts/manipulator/our_manipulator in component_parts)
production_coefficient -= our_manipulator.rating * 0.2
production_coefficient = clamp(production_coefficient, 0, 1) // coefficient goes from 1 -> 0.8 -> 0.6 -> 0.4
/obj/machinery/limbgrower/examine(mob/user)
. = ..()
if(!panel_open)
. += "<span class='notice'>It looks like as if the panel were open you could rotate it with a <b>wrench</b>.</span>"
else
. += "<span class='notice'>The panel is open.</span>"
if(in_range(user, src) || isobserver(user))
. += "<span class='notice'>The status display reads: Storing up to <b>[reagents.maximum_volume]u</b> of synthflesh.<br>Synthflesh consumption at <b>[prod_coeff*100]%</b>.<span>"
. += "<span class='notice'>The status display reads: Storing up to <b>[reagents.maximum_volume]u</b> of reagents.<br>Reagent consumption rate at <b>[production_coefficient * 100]%</b>.</span>"
/obj/machinery/limbgrower/proc/main_win(mob/user)
var/dat = "<div class='statusDisplay'><h3>[src] Menu:</h3><br>"
dat += "<A href='?src=[REF(src)];dna_disk=1'>[dna_disk ? "Remove" : "Insert"] cloning data disk</A>"
dat += "<hr>"
dat += "<A href='?src=[REF(src)];menu=[LIMBGROWER_CHEMICAL_MENU]'>Chemical Storage</A>"
dat += materials_printout()
dat += "<table style='width:100%' align='center'><tr>"
for(var/C in categories)
dat += "<td><A href='?src=[REF(src)];category=[C];menu=[LIMBGROWER_CATEGORY_MENU]'>[C]</A></td>"
dat += "</tr><tr>"
//one category per line
dat += "</tr></table></div>"
return dat
/obj/machinery/limbgrower/proc/category_win(mob/user,selected_category)
var/dat = "<A href='?src=[REF(src)];menu=[LIMBGROWER_MAIN_MENU]'>Return to main menu</A>"
dat += "<div class='statusDisplay'><h3>Browsing [selected_category]:</h3><br>"
dat += materials_printout()
for(var/v in stored_research.researched_designs)
var/datum/design/D = SSresearch.techweb_design_by_id(v)
if(!(selected_category in D.category))
continue
if(disabled || !can_build(D))
dat += "<span class='linkOff'>[D.name]</span>"
else
dat += "<a href='?src=[REF(src)];make=[D.id];multiplier=1'>[D.name]</a>"
dat += "[get_design_cost(D)]<br>"
dat += "</div>"
return dat
/obj/machinery/limbgrower/proc/chemical_win(mob/user)
var/dat = "<A href='?src=[REF(src)];menu=[LIMBGROWER_MAIN_MENU]'>Return to main menu</A>"
dat += "<div class='statusDisplay'><h3>Browsing Chemical Storage:</h3><br>"
dat += materials_printout()
for(var/datum/reagent/R in reagents.reagent_list)
dat += "[R.name]: [R.volume]"
dat += "<A href='?src=[REF(src)];disposeI=[R]'>Purge</A><BR>"
dat += "</div>"
return dat
/obj/machinery/limbgrower/proc/materials_printout()
var/dat = "<b>Total amount:></b> [reagents.total_volume] / [reagents.maximum_volume] cm<sup>3</sup><br>"
return dat
/obj/machinery/limbgrower/proc/can_build(datum/design/D)
return (reagents.has_reagent(/datum/reagent/medicine/synthflesh, D.reagents_list[/datum/reagent/medicine/synthflesh]*prod_coeff)) //Return whether the machine has enough synthflesh to produce the design
/obj/machinery/limbgrower/proc/get_design_cost(datum/design/D)
var/dat
if(D.reagents_list[/datum/reagent/medicine/synthflesh])
dat += "[D.reagents_list[/datum/reagent/medicine/synthflesh] * prod_coeff] Synthetic flesh "
return dat
/*
* Checks our reagent list to see if a design can be built.
*
* limb_design - the design we're checking for buildability.
*
* returns TRUE if we have enough reagent to build it. Returns FALSE if we do not.
*/
/obj/machinery/limbgrower/proc/can_build(datum/design/limb_design)
for(var/datum/reagent/reagent_id in limb_design.reagents_list)
if(!reagents.has_reagent(reagent_id, limb_design.reagents_list[reagent_id] * production_coefficient))
return FALSE
return TRUE
/// Emagging a limbgrower allows you to build synthetic armblades.
/obj/machinery/limbgrower/emag_act(mob/user)
. = ..()
if(obj_flags & EMAGGED)
return
for(var/id in SSresearch.techweb_designs)
var/datum/design/D = SSresearch.techweb_design_by_id(id)
if((D.build_type & LIMBGROWER) && ("emagged" in D.category))
stored_research.add_design(D)
for(var/design_id in SSresearch.techweb_designs)
var/datum/design/found_design = SSresearch.techweb_design_by_id(design_id)
if((found_design.build_type & LIMBGROWER) && ("emagged" in found_design.category))
stored_research.add_design(found_design)
to_chat(user, "<span class='warning'>A warning flashes onto the screen, stating that safety overrides have been deactivated!</span>")
obj_flags |= EMAGGED
return TRUE
update_static_data(user)
/obj/machinery/limbgrower/AltClick(mob/living/user)
. = ..()
eject_disk(user)
/obj/machinery/limbgrower/proc/eject_disk(mob/user)
if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
if(busy)
to_chat(user, "<span class=\"alert\">\The [src] is busy. Please wait for completion of previous operation.</span>")
@@ -326,6 +364,7 @@
dna_disk.forceMove(src.loc)
user.put_in_active_hand(dna_disk)
to_chat(user, "<span class='notice'>You remove \the [dna_disk] from \the [src].</span>")
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
dna_disk = null
else
to_chat(user, "<span class='warning'>\The [src] has doesn't have a disk on it!")
code/game/objects/items/airlock_painter.dm
+7 -1
View File
@@ -157,7 +157,7 @@
to_chat(user, "<span class='notice'>You need to get closer!</span>")
return
if(use_paint(user) && isturf(F))
F.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', stored_decal_total, turn(stored_dir, -dir2angle(F.dir)), CLEAN_STRONG, color, null, null, alpha)
F.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', stored_decal_total, stored_dir, CLEAN_STRONG, color, null, null, alpha)
/obj/item/airlock_painter/decal/attack_self(mob/user)
if((ink) && (ink.charges >= 1))
@@ -180,6 +180,11 @@
stored_decal_total = "[stored_decal][yellow_fix][stored_color]"
return
/obj/item/airlock_painter/decal/ui_assets(mob/user)
return list(
get_asset_datum(/datum/asset/spritesheet/decals)
)
/obj/item/airlock_painter/decal/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
@@ -189,6 +194,7 @@
/obj/item/airlock_painter/decal/ui_data(mob/user)
var/list/data = list()
data["decal_direction"] = stored_dir
data["decal_dir_text"] = dir2text(stored_dir)
data["decal_color"] = stored_color
data["decal_style"] = stored_decal
data["decal_list"] = list()
code/game/objects/items/chromosome.dm
-15
View File
@@ -75,18 +75,3 @@
desc = "A chromosome that reduces action based mutation cooldowns by by 50%."
icon_state = "energy"
energy_coeff = 0.5
/obj/item/chromosome/reinforcer
name = "reinforcement chromosome"
desc = "A chromosome that renders mutations immune to mutadone."
icon_state = "reinforcer"
weight = 3
/obj/item/chromosome/reinforcer/can_apply(datum/mutation/human/HM)
if(!HM || !(HM.can_chromosome == CHROMOSOME_NONE))
return FALSE
return !HM.mutadone_proof
/obj/item/chromosome/reinforcer/apply(datum/mutation/human/HM)
HM.mutadone_proof = TRUE
..()
code/game/objects/items/miscellaneous.dm
+2 -2
View File
@@ -135,8 +135,8 @@
/obj/item/organ/cyberimp/arm/toolset,
/obj/item/organ/cyberimp/arm/surgery,
/obj/item/organ/cyberimp/chest/thrusters,
/obj/item/organ/lungs/cybernetic,
/obj/item/organ/liver/cybernetic) //cyberimplants range from a nice bonus to fucking broken bullshit so no subtypesof
/obj/item/organ/lungs/cybernetic/tier3,
/obj/item/organ/liver/cybernetic/tier3) //cyberimplants range from a nice bonus to fucking broken bullshit so no subtypesof
for(var/V in templist)
var/atom/A = V
augment_list[initial(A.name)] = A
code/game/objects/structures/crates_lockers/crates/secure.dm
+5
View File
@@ -56,6 +56,11 @@
name = "gear crate"
icon_state = "secgearcrate"
/obj/structure/closet/crate/secure/soviet
desc = "A crate, purportedly from Space Russia."
name = "soviet crate"
icon_state = "sovietcrate"
/obj/structure/closet/crate/secure/hydroponics
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
name = "secure hydroponics crate"
code/modules/asset_cache/asset_list_items.dm
+8
View File
@@ -345,6 +345,14 @@
InsertAll("", each, GLOB.alldirs)
..()
/datum/asset/spritesheet/decals
name = "decals"
/datum/asset/spritesheet/decals/register()
for(var/each in list('icons/turf/decals.dmi'))
InsertAll("", each, GLOB.alldirs)
..()
/datum/asset/spritesheet/supplypods
name = "supplypods"
code/modules/awaymissions/gateway.dm
+49 -13
View File
@@ -4,10 +4,10 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
GLOBAL_LIST_EMPTY(gateway_destinations)
/**
* Corresponds to single entry in gateway control.
*
* Will NOT be added automatically to GLOB.gateway_destinations list.
*/
* Corresponds to single entry in gateway control.
*
* Will NOT be added automatically to GLOB.gateway_destinations list.
*/
/datum/gateway_destination
var/name = "Unknown Destination"
var/wait = 0 /// How long after roundstart this destination becomes active
@@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
. = "Exit gateway unpowered."
/datum/gateway_destination/gateway/get_target_turf()
return get_step(target_gateway.portal,SOUTH)
return get_step(target_gateway, SOUTH)
/datum/gateway_destination/gateway/post_transfer(atom/movable/AM)
. = ..()
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
name = "gateway"
desc = "A mysterious gateway built by unknown hands, it allows for faster than light travel to far-flung locations."
icon = 'icons/obj/machines/gateway.dmi'
icon_state = "off"
icon_state = "portal_frame"
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
// 3x2 offset by one row
@@ -171,10 +171,14 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
var/datum/gateway_destination/target
/// bumper object, the thing that starts actual teleport
var/obj/effect/gateway_portal_bumper/portal
/// Visual object for handling the viscontents
var/obj/effect/gateway_portal_effect/portal_visuals
/obj/machinery/gateway/Initialize()
generate_destination()
update_icon()
portal_visuals = new
vis_contents += portal_visuals
return ..()
/obj/machinery/gateway/proc/generate_destination()
@@ -191,6 +195,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
if(use_power == ACTIVE_POWER_USE)
use_power = IDLE_POWER_USE
update_icon()
portal_visuals.reset_visuals()
/obj/machinery/gateway/process()
if((stat & (NOPOWER)) && use_power)
@@ -198,12 +203,6 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
deactivate()
return
/obj/machinery/gateway/update_icon_state()
if(target)
icon_state = "on"
else
icon_state = "off"
/obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
return
@@ -216,6 +215,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
return
target = D
target.activate(destination)
portal_visuals.setup_visuals(target)
generate_bumper()
use_power = ACTIVE_POWER_USE
update_icon()
@@ -307,7 +307,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
try_to_connect(D)
return TRUE
if("deactivate")
if(G && G.target)
if(G?.target)
G.deactivate()
return TRUE
@@ -324,3 +324,39 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
/obj/item/paper/fluff/gateway
info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Bluespace Research"
name = "Confidential Correspondence, Pg 1"
/obj/effect/gateway_portal_effect
appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
vis_flags = VIS_INHERIT_ID
layer = GATEWAY_UNDERLAY_LAYER //Slightly lower than gateway itself
var/alpha_icon = 'icons/obj/machines/gateway.dmi'
var/alpha_icon_state = "portal_mask"
var/datum/gateway_destination/our_destination
/obj/effect/gateway_portal_effect/proc/setup_visuals(datum/gateway_destination/D)
our_destination = D
update_portal_filters()
/obj/effect/gateway_portal_effect/proc/reset_visuals()
our_destination = null
update_portal_filters()
/obj/effect/gateway_portal_effect/proc/update_portal_filters()
clear_filters()
vis_contents = null
if(!our_destination)
return
add_filter("portal_alpha", 1, list("type" = "alpha", "icon" = icon(alpha_icon, alpha_icon_state), "x" = 32, "y" = 32))
add_filter("portal_blur", 1, list("type" = "blur", "size" = 0.5))
add_filter("portal_ripple", 1, list("type" = "ripple", "size" = 2, "radius" = 1, "falloff" = 1, "y" = 7))
animate(get_filter("portal_ripple"), time = 1.3 SECONDS, loop = -1, easing = LINEAR_EASING, radius = 32)
var/turf/center_turf = our_destination.get_target_turf()
vis_contents += block(locate(center_turf.x - 1, center_turf.y - 1, center_turf.z), locate(center_turf.x + 1, center_turf.y + 1, center_turf.z))
code/modules/cargo/exports/organs_robotics.dm
+8 -7
View File
@@ -75,7 +75,7 @@
cost = 250
unit_name = "heart"
export_types = list(/obj/item/organ/heart)
exclude_types = list(/obj/item/organ/heart/cursed, /obj/item/organ/heart/cybernetic)
exclude_types = list(/obj/item/organ/heart/cursed, /obj/item/organ/heart/cybernetic/tier2, /obj/item/organ/heart/cybernetic/tier3)
/datum/export/organs/tongue
cost = 75
@@ -92,29 +92,30 @@
cost = 50 //can be replaced
unit_name = "stomach"
export_types = list(/obj/item/organ/stomach)
exclude_types = list(/obj/item/organ/stomach/cybernetic/tier2, /obj/item/organ/stomach/cybernetic/tier3)
/datum/export/organs/lungs
cost = 150
unit_name = "lungs"
export_types = list(/obj/item/organ/lungs)
exclude_types = list(/obj/item/organ/lungs/cybernetic, /obj/item/organ/lungs/cybernetic/upgraded)
export_types = list(/obj/item/organ/lungs,)
exclude_types = list(/obj/item/organ/lungs/cybernetic/tier2, /obj/item/organ/lungs/cybernetic/tier3)
/datum/export/organs/liver
cost = 175
unit_name = "liver"
export_types = list(/obj/item/organ/liver)
exclude_types = list(/obj/item/organ/liver/cybernetic, /obj/item/organ/liver/cybernetic/upgraded)
exclude_types = list(/obj/item/organ/liver/cybernetic/tier2, /obj/item/organ/liver/cybernetic/tier3)
/datum/export/organs/cybernetic
cost = 225
unit_name = "cybernetic organ"
export_types = list(/obj/item/organ/liver/cybernetic, /obj/item/organ/lungs/cybernetic, /obj/item/organ/eyes/robotic, /obj/item/organ/heart/cybernetic)
exclude_types = list(/obj/item/organ/lungs/cybernetic/upgraded, /obj/item/organ/liver/cybernetic/upgraded)
export_types = list(/obj/item/organ/liver/cybernetic/tier2, /obj/item/organ/lungs/cybernetic/tier2, /obj/item/organ/eyes/robotic/shield, /obj/item/organ/eyes/robotic/glow, /obj/item/organ/stomach/cybernetic/tier2, /obj/item/organ/heart/cybernetic/tier2)
exclude_types = list(/obj/item/organ/liver/cybernetic/tier3, /obj/item/organ/lungs/cybernetic/tier3, /obj/item/organ/eyes/robotic/xray, /obj/item/organ/eyes/robotic/thermals, /obj/item/organ/stomach/cybernetic/tier3, /obj/item/organ/heart/cybernetic/tier3)
/datum/export/organs/upgraded
cost = 275
unit_name = "upgraded cybernetic organ"
export_types = list(/obj/item/organ/lungs/cybernetic/upgraded, /obj/item/organ/liver/cybernetic/upgraded)
export_types = list(/obj/item/organ/liver/cybernetic/tier3, /obj/item/organ/lungs/cybernetic/tier3, /obj/item/organ/eyes/robotic/xray, /obj/item/organ/eyes/robotic/thermals, /obj/item/organ/stomach/cybernetic/tier3, /obj/item/organ/heart/cybernetic/tier3)
/datum/export/organs/tail // yeah have fun pulling this off someone without catching a bwoink
cost = 500
code/modules/cargo/packs/armory.dm
+1
View File
@@ -176,6 +176,7 @@
/obj/effect/spawner/bundle/crate/surplusrifle,
/obj/item/storage/toolbox/ammo/surplus)
crate_name = "surplus military crate"
crate_type = /obj/structure/closet/crate/secure/soviet
/datum/supply_pack/security/armory/russian/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 5)
code/modules/cargo/packs/security.dm
+10 -10
View File
@@ -80,15 +80,15 @@
/datum/supply_pack/security/russianclothing
name = "Russian Surplus Clothing"
desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproof armor, a few union suits and some warm hats!"
contraband = TRUE
cost = 5750 // Its basicly sec suits, good boots/gloves
contains = list(/obj/item/clothing/suit/armor/navyblue/russian,
/obj/item/clothing/suit/armor/navyblue/russian,
contains = list(/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
@@ -98,23 +98,23 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas)
crate_name = "surplus russian clothing"
crate_type = /obj/structure/closet/crate/internals
crate_type = /obj/structure/closet/crate/secure/soviet
/datum/supply_pack/security/russian_partisan
name = "Russian Partisan Gear"
desc = "An old russian partisan equipment crate, comes with a full russian outfit, a loaded surplus rifle and a second magazine."
contraband = TRUE
access = FALSE
cost = 6500
contains = list(/obj/item/clothing/suit/armor/navyblue/russian,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/head/ushanka,
/obj/item/clothing/head/helmet/rus_helmet,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/gloves/tackler/combat/insulated,
/obj/item/clothing/under/syndicate/rus_army,
/obj/item/clothing/mask/gas)
crate_name = "surplus russian gear"
crate_type = /obj/structure/closet/crate/internals
crate_type = /obj/structure/closet/crate/secure/soviet
/datum/supply_pack/security/russian_partisan/fill(obj/structure/closet/crate/C)
..()
@@ -241,7 +241,7 @@
access = FALSE
access_any = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS)
contains = list(/obj/item/ammo_box/c38/dumdum)
crate_name = ".38 match crate"
crate_name = ".38 dumdum crate"
/datum/supply_pack/security/match
name = ".38 Match Grade Speedloader"
code/modules/client/verbs/autobunker.dm
+1 -1
View File
@@ -3,7 +3,7 @@
set desc = "Authorizes your account in the panic bunker of any servers connected to this function."
set category = "OOC"
if(!(prefs.db_flags & DB_FLAG_AGE_CONFIRMATION_INCOMPLETE))
if(prefs.db_flags & DB_FLAG_AGE_CONFIRMATION_INCOMPLETE)
to_chat(src, "<span class='danger'>You are not age verified.</span>")
return
code/modules/clothing/glasses/_glasses.dm
+6
View File
@@ -358,6 +358,12 @@
..()
user.cure_blind("blindfold_[REF(src)]")
/obj/item/clothing/glasses/fakeblindfold
name = "thin blindfold"
desc = "Covers the eyes, but not thick enough to obscure vision. Mostly for aesthetic."
icon_state = "blindfoldwhite"
item_state = "blindfoldwhite"
/obj/item/clothing/glasses/sunglasses/blindfold/white
name = "blind personnel blindfold"
desc = "Indicates that the wearer suffers from blindness."
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -145,7 +145,7 @@
/obj/item/clothing/suit/armor/riot
name = "riot suit"
desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Helps the wearer resist shoving in close quarters."
icon_state = "riot"
icon_state = "swat"
item_state = "swat_suit"
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
code/modules/library/soapstone.dm
+1 -1
View File
@@ -152,7 +152,7 @@
var/newcolor = copytext_char(hash, 1, 7)
add_atom_colour("#[newcolor]", FIXED_COLOUR_PRIORITY)
light_color = "#[newcolor]"
set_light(1)
set_light(0.3)
/obj/structure/chisel_message/proc/pack()
var/list/data = list()
code/modules/lighting/lighting_object.dm
+1
View File
@@ -10,6 +10,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
layer = LIGHTING_LAYER
invisibility = INVISIBILITY_LIGHTING
vis_flags = VIS_HIDE
var/needs_update = FALSE
var/turf/myturf
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+1 -1
View File
@@ -443,7 +443,7 @@ Difficulty: Hard
charge(chargeat, delay, chargepast)
/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination
name = "bubblegum's hallucination"
name = "Bubblegum's hallucination"
desc = "Is that really just a hallucination?"
health = 1
maxHealth = 1
code/modules/projectiles/ammunition/special/syringe.dm
+2 -2
View File
@@ -25,7 +25,7 @@
/obj/item/ammo_casing/chemgun
name = "dart synthesiser"
desc = "A high-power spring, linked to an energy-based dart synthesiser."
projectile_type = /obj/item/projectile/bullet/dart
projectile_type = /obj/item/projectile/bullet/dart/piercing
firing_effect_type = null
/obj/item/ammo_casing/chemgun/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
@@ -35,7 +35,7 @@
var/obj/item/gun/chem/CG = loc
if(CG.syringes_left <= 0)
return
CG.reagents.trans_to(BB, 15)
CG.reagents.trans_to(BB, 10)
BB.name = "chemical dart"
CG.syringes_left--
..()
code/modules/projectiles/guns/ballistic/automatic.dm
+2 -2
View File
@@ -407,11 +407,11 @@
fire_sound = 'sound/weapons/rifleshot.ogg'
weapon_weight = WEAPON_HEAVY
mag_type = /obj/item/ammo_box/magazine/m10mm/rifle
fire_delay = 30
fire_delay = 10
burst_size = 1
can_unsuppress = TRUE
can_suppress = TRUE
w_class = WEIGHT_CLASS_HUGE
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
automatic_burst_overlay = FALSE
actions_types = list()
code/modules/projectiles/guns/misc/chem_gun.dm
+3 -3
View File
@@ -13,9 +13,9 @@
custom_materials = list(/datum/material/iron=2000)
clumsy_check = FALSE
fire_sound = 'sound/items/syringeproj.ogg'
var/time_per_syringe = 250
var/syringes_left = 4
var/max_syringes = 4
var/time_per_syringe = 300
var/syringes_left = 5
var/max_syringes = 5
var/last_synth = 0
/obj/item/gun/chem/Initialize()
code/modules/research/designs/medical_designs.dm
+82 -39
View File
@@ -644,66 +644,109 @@
//Cybernetic organs
/datum/design/cybernetic_liver
name = "Cybernetic Liver"
desc = "A cybernetic liver"
name = "Basic Cybernetic Liver"
desc = "A basic cybernetic liver."
id = "cybernetic_liver"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/liver/cybernetic
category = list("Misc","Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_heart
name = "Cybernetic Heart"
desc = "A cybernetic heart"
id = "cybernetic_heart"
build_type = PROTOLATHE | MECHFAB
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/heart/cybernetic
category = list("Misc","Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_heart_u
name = "Upgraded Cybernetic Heart"
desc = "An upgraded cybernetic heart"
id = "cybernetic_heart_u"
build_type = PROTOLATHE | MECHFAB
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500)
build_path = /obj/item/organ/heart/cybernetic/upgraded
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_liver_u
name = "Upgraded Cybernetic Liver"
desc = "An upgraded cybernetic liver"
id = "cybernetic_liver_u"
build_type = PROTOLATHE | MECHFAB
/datum/design/cybernetic_liver/tier2
name = "Cybernetic Liver"
desc = "A cybernetic liver."
id = "cybernetic_liver_tier2"
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/liver/cybernetic/upgraded
category = list("Misc","Medical Designs")
build_path = /obj/item/organ/liver/cybernetic/tier2
/datum/design/cybernetic_liver/tier3
name = "Upgraded Cybernetic Liver"
desc = "An upgraded cybernetic liver."
id = "cybernetic_liver_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000)
build_path = /obj/item/organ/liver/cybernetic/tier3
/datum/design/cybernetic_heart
name = "Basic Cybernetic Heart"
desc = "A basic cybernetic heart."
id = "cybernetic_heart"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/heart/cybernetic
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_heart/tier2
name = "Cybernetic Heart"
desc = "A cybernetic heart."
id = "cybernetic_heart_tier2"
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/heart/cybernetic/tier2
/datum/design/cybernetic_heart/tier3
name = "Upgraded Cybernetic Heart"
desc = "An upgraded cybernetic heart."
id = "cybernetic_heart_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000)
build_path = /obj/item/organ/heart/cybernetic/tier3
/datum/design/cybernetic_lungs
name = "Cybernetic Lungs"
desc = "A pair of cybernetic lungs."
name = "Basic Cybernetic Lungs"
desc = "A basic pair of cybernetic lungs."
id = "cybernetic_lungs"
build_type = PROTOLATHE | MECHFAB
construction_time = 40
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/lungs/cybernetic
category = list("Misc","Medical Designs")
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_lungs_u
/datum/design/cybernetic_lungs/tier2
name = "Cybernetic Lungs"
desc = "A pair of cybernetic lungs."
id = "cybernetic_lungs_tier2"
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/lungs/cybernetic/tier2
/datum/design/cybernetic_lungs/tier3
name = "Upgraded Cybernetic Lungs"
desc = "A pair of upgraded cybernetic lungs."
id = "cybernetic_lungs_u"
id = "cybernetic_lungs_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000)
build_path = /obj/item/organ/lungs/cybernetic/tier3
/datum/design/cybernetic_stomach
name = "Basic Cybernetic Stomach"
desc = "A basic cybernetic stomach."
id = "cybernetic_stomach"
build_type = PROTOLATHE | MECHFAB
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500)
build_path = /obj/item/organ/lungs/cybernetic/upgraded
category = list("Misc","Medical Designs")
construction_time = 40
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/stomach/cybernetic
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_stomach/tier2
name = "Cybernetic Stomach"
desc = "A cybernetic stomach."
id = "cybernetic_stomach_tier2"
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/stomach/cybernetic/tier2
/datum/design/cybernetic_stomach/tier3
name = "Upgraded Cybernetic Stomach"
desc = "An upgraded cybernetic stomach."
id = "cybernetic_stomach_tier3"
construction_time = 50
materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000)
build_path = /obj/item/organ/stomach/cybernetic/tier3
/datum/design/cybernetic_tongue
name = "Cybernetic tongue"
desc = "A fancy cybernetic tongue."
@@ -711,7 +754,7 @@
build_type = PROTOLATHE | MECHFAB
materials = list(/datum/material/iron = 500, /datum/material/glass = 500)
build_path = /obj/item/organ/tongue/cybernetic
category = list("Misc","Medical Designs")
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/cybernetic_ears
code/modules/research/techweb/nodes/medical_nodes.dm
+11 -4
View File
@@ -67,20 +67,27 @@
design_ids = list("implanter", "implantcase", "implant_chem", "implant_tracking", "locator", "c38_trac")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
/datum/techweb_node/basic_cyber_organs
id = "basic_cyber_organs"
starting_node = TRUE
display_name = "Basic Cybernetic Organs"
description = "We have the techinology to force him to live a disgusting halflife."
design_ids = list("cybernetic_liver", "cybernetic_heart", "cybernetic_lungs", "cybernetic_stomach")
/datum/techweb_node/cyber_organs
id = "cyber_organs"
display_name = "Cybernetic Organs"
description = "We have the technology to rebuild him."
prereq_ids = list("adv_biotech")
design_ids = list("cybernetic_ears", "cybernetic_heart", "cybernetic_liver", "cybernetic_lungs", "cybernetic_tongue")
prereq_ids = list("biotech")
design_ids = list("cybernetic_ears", "cybernetic_heart_tier2", "cybernetic_liver_tier2", "cybernetic_lungs_tier2", "cybernetic_stomach_tier2")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
/datum/techweb_node/cyber_organs_upgraded
id = "cyber_organs_upgraded"
display_name = "Upgraded Cybernetic Organs"
description = "We have the technology to upgrade him."
prereq_ids = list("cyber_organs")
design_ids = list("cybernetic_ears_u", "cybernetic_heart_u", "cybernetic_liver_u", "cybernetic_lungs_u", "ipc_stomach")
prereq_ids = list("adv_biotech", "cyber_organs")
design_ids = list("cybernetic_ears_u", "cybernetic_heart_tier3", "cybernetic_liver_tier3", "cybernetic_lungs_tier3", "cybernetic_stomach_tier3")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500)
/datum/techweb_node/cyber_implants
code/modules/research/techweb/nodes/syndicate_nodes.dm
+1 -1
View File
@@ -21,7 +21,7 @@
id = "advanced_illegal_ballistics"
display_name = "Advanced Non-Standard Ballistics"
description = "Ballistic ammunition for non-standard firearms. Usually the ones you don't have nor want to be involved with."
design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip")
design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip","m10apbox","m10firebox","m10hpbox")
prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns from traitors, space, or anything in between.
code/modules/spells/spell_types/shadow_walk.dm
+2 -2
View File
@@ -56,9 +56,9 @@
/obj/effect/dummy/phased_mob/shadow/proc/check_light_level()
var/turf/T = get_turf(src)
var/light_amount = T.get_lumcount()
if(light_amount > 0.2) // jaunt ends
if(light_amount > 0.4) // jaunt ends
end_jaunt(TRUE)
else if (light_amount < 0.2 && (!QDELETED(jaunter))) //heal in the dark
else if (light_amount < 0.4 && (!QDELETED(jaunter))) //heal in the dark
jaunter.heal_overall_damage(1,1)
/obj/effect/dummy/phased_mob/shadow/proc/end_jaunt(forced = FALSE)
code/modules/surgery/organs/heart.dm
+48 -26
View File
@@ -197,45 +197,67 @@
colour = "red"
/obj/item/organ/heart/cybernetic
name = "cybernetic heart"
desc = "An electronic device designed to mimic the functions of an organic human heart. Offers no benefit over an organic heart other than being easy to make."
name = "basic cybernetic heart"
desc = "A basic electronic device designed to mimic the functions of an organic human heart."
icon_state = "heart-c"
organ_flags = ORGAN_SYNTHETIC
maxHealth = STANDARD_ORGAN_THRESHOLD*0.75 //This also hits defib timer, so a bit higher than its less important counterparts
var/dose_available = FALSE
var/rid = /datum/reagent/medicine/epinephrine
var/ramount = 10
var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage.
/obj/item/organ/heart/cybernetic/tier2
name = "cybernetic heart"
desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma."
icon_state = "heart-c-u"
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
dose_available = TRUE
emp_vulnerability = 2
/obj/item/organ/heart/cybernetic/tier3
name = "upgraded cybernetic heart"
desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
icon_state = "heart-c-u2"
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
dose_available = TRUE
rid = /datum/reagent/medicine/atropine
ramount = 5
emp_vulnerability = 3
/obj/item/organ/heart/cybernetic/emp_act(severity)
. = ..()
// If the owner doesn't need a heart, we don't need to do anything with it.
if(!owner.needs_heart())
return
if(. & EMP_PROTECT_SELF)
return
Stop()
addtimer(CALLBACK(src, .proc/Restart), 0.2*severity SECONDS)
damage += severity
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.Dizzy(10)
owner.losebreath += 10
COOLDOWN_START(src, severe_cooldown, 20 SECONDS)
if(prob(severity/emp_vulnerability)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
Stop()
owner.visible_message("<span class='danger'>[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!</span>", \
"<span class='userdanger'>You feel a terrible pain in your chest, as if your heart has stopped!</span>")
addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS)
/obj/item/organ/heart/cybernetic/upgraded
name = "upgraded cybernetic heart"
desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
icon_state = "heart-c-u"
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
//I put it on upgraded for now.
var/dose_available = TRUE
var/rid = /datum/reagent/medicine/epinephrine
var/ramount = 10
/obj/item/organ/heart/cybernetic/upgraded/on_life()
/obj/item/organ/heart/cybernetic/on_life(delta_time, times_fired)
. = ..()
if(!.)
return
if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid))
owner.reagents.add_reagent(rid, ramount)
used_dose()
if(ramount < 10) //eats your nutrition to regen epinephrine
var/regen_amount = owner.nutrition/2000
owner.adjust_nutrition(-regen_amount)
ramount += regen_amount
/obj/item/organ/heart/cybernetic/upgraded/proc/used_dose()
/obj/item/organ/heart/cybernetic/proc/used_dose()
owner.reagents.add_reagent(rid, ramount)
dose_available = FALSE
/obj/item/organ/heart/cybernetic/tier3/used_dose()
. = ..()
addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
ramount = 0
/obj/item/organ/heart/ipc
name = "IPC heart"
code/modules/surgery/organs/liver.dm
+27 -9
View File
@@ -98,23 +98,41 @@
icon_state = "liver-c"
/obj/item/organ/liver/cybernetic
name = "cybernetic liver"
name = "basic cybernetic liver"
icon_state = "liver-c"
desc = "An electronic device designed to mimic the functions of a human liver. It has no benefits over an organic liver, but is easy to produce."
desc = "A very basic device designed to mimic the functions of a human liver. Handles toxins slightly worse than an organic liver."
organ_flags = ORGAN_SYNTHETIC
maxHealth = 1.1 * STANDARD_ORGAN_THRESHOLD
toxTolerance = 0.3 * LIVER_DEFAULT_TOX_TOLERANCE //little less than 1u of toxin purging
toxLethality = 1.1 * LIVER_DEFAULT_TOX_LETHALITY
maxHealth = STANDARD_ORGAN_THRESHOLD*0.5
/obj/item/organ/liver/cybernetic/upgraded
name = "upgraded cybernetic liver"
var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage.
/obj/item/organ/liver/cybernetic/tier2
name = "cybernetic liver"
icon_state = "liver-c-u"
desc = "An upgraded version of the cybernetic liver, designed to improve upon organic livers. It is resistant to alcohol poisoning and is very robust at filtering toxins."
desc = "An electronic device designed to mimic the functions of a human liver. Handles toxins slightly better than an organic liver."
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
toxTolerance = 2 * LIVER_DEFAULT_TOX_TOLERANCE //6 units of toxin purging
toxLethality = 0.8 * LIVER_DEFAULT_TOX_LETHALITY //20% less damage than a normal liver
emp_vulnerability = 2
/obj/item/organ/liver/cybernetic/tier3
name = "upgraded cybernetic liver"
icon_state = "liver-c-u2"
desc = "An upgraded version of the cybernetic liver, designed to improve further upon organic livers. It is resistant to alcohol poisoning and is very robust at filtering toxins."
alcohol_tolerance = 0.001
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
toxTolerance = 15 //can shrug off up to 15u of toxins
toxLethality = 0.008 //20% less damage than a normal liver
toxTolerance = 5 * LIVER_DEFAULT_TOX_TOLERANCE //15 units of toxin purging
toxLethality = 0.4 * LIVER_DEFAULT_TOX_LETHALITY //60% less damage than a normal liver
emp_vulnerability = 3
/obj/item/organ/liver/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
damage += severity
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.adjustToxLoss(10)
COOLDOWN_START(src, severe_cooldown, 10 SECONDS)
if(prob(severity/emp_vulnerability)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
code/modules/surgery/organs/lungs.dm
+35 -16
View File
@@ -547,33 +547,52 @@
maxHealth = INFINITY//I don't understand how plamamen work, so I'm not going to try t give them special lungs atm
/obj/item/organ/lungs/cybernetic
name = "cybernetic lungs"
desc = "A cybernetic version of the lungs found in traditional humanoid entities. It functions the same as an organic lung and is merely meant as a replacement."
name = "basic cybernetic lungs"
desc = "A basic cybernetic version of the lungs found in traditional humanoid entities."
icon_state = "lungs-c"
organ_flags = ORGAN_SYNTHETIC
maxHealth = 400
safe_oxygen_min = 13
maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5
/obj/item/organ/lungs/cybernetic/emp_act()
. = ..()
if(. & EMP_PROTECT_SELF)
return
owner.losebreath = 20
owner.adjustOrganLoss(ORGAN_SLOT_LUNGS, 25)
var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage.
/obj/item/organ/lungs/cybernetic/upgraded
name = "upgraded cybernetic lungs"
desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon dioxide."
/obj/item/organ/lungs/cybernetic/tier2
name = "cybernetic lungs"
desc = "A cybernetic version of the lungs found in traditional humanoid entities. Allows for greater intakes of oxygen than organic lungs, requiring slightly less pressure."
icon_state = "lungs-c-u"
safe_toxins_max = 20
safe_co2_max = 20
safe_oxygen_max = 250
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
safe_oxygen_min = 13
safe_oxygen_max = 100
emp_vulnerability = 2
/obj/item/organ/lungs/cybernetic/tier3
name = "upgraded cybernetic lungs"
desc = "A more advanced version of the stock cybernetic lungs. Features the ability to filter out various airbourne toxins and carbon dioxide even at heavy levels."
icon_state = "lungs-c-u2"
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
safe_oxygen_min = 4 //You could literally be breathing the thinnest amount of oxygen and be fine
safe_oxygen_max = 250 //Or be in an enriched oxygen room for that matter
safe_toxins_max = 30
safe_co2_max = 30
SA_para_min = 30
SA_sleep_min = 50
BZ_trip_balls_min = 30
emp_vulnerability = 3
cold_level_1_threshold = 200
cold_level_2_threshold = 140
cold_level_3_threshold = 100
maxHealth = 550
/obj/item/organ/lungs/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.losebreath += 20
COOLDOWN_START(src, severe_cooldown, 30 SECONDS)
if(prob(severity/emp_vulnerability)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
/obj/item/organ/lungs/ashwalker
name = "ash lungs"
desc = "blackened lungs identical from specimens recovered from lavaland, unsuited to higher air pressures."
code/modules/surgery/organs/organ_internal.dm
+4
View File
@@ -16,6 +16,7 @@
var/decay_factor = 0 //same as above but when without a living owner, set to 0 for generic organs
var/high_threshold = STANDARD_ORGAN_THRESHOLD * 0.45 //when severe organ damage occurs
var/low_threshold = STANDARD_ORGAN_THRESHOLD * 0.1 //when minor organ damage occurs
var/severe_cooldown //cooldown for severe effects, used for synthetic organ emp effects.
///Organ variables for determining what we alert the owner with when they pass/clear the damage thresholds
var/prev_damage = 0
@@ -153,6 +154,9 @@
/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing or synthetic
if(organ_flags & ORGAN_FAILING || !owner)
return FALSE
if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing.
applyOrganDamage(maxHealth * decay_factor)
return
if(!is_cold() && damage)
///Damage decrements by a percent of its maxhealth
var/healing_amount = -(maxHealth * healing_factor)
code/modules/surgery/organs/stomach.dm
+34
View File
@@ -93,6 +93,40 @@
icon_state = "stomach-p"
desc = "A strange crystal that is responsible for metabolizing the unseen energy force that feeds plasmamen."
/obj/item/organ/stomach/cybernetic
name = "basic cybernetic stomach"
icon_state = "stomach-c"
desc = "A basic device designed to mimic the functions of a human stomach"
organ_flags = ORGAN_SYNTHETIC
maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5
var/emp_vulnerability = 1 //The value the severity of emps are divided by to determine the likelihood of permanent damage.
/obj/item/organ/stomach/cybernetic/tier2
name = "cybernetic stomach"
icon_state = "stomach-c-u"
desc = "An electronic device designed to mimic the functions of a human stomach. Handles disgusting food a bit better."
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
disgust_metabolism = 2
emp_vulnerability = 2
/obj/item/organ/stomach/cybernetic/tier3
name = "upgraded cybernetic stomach"
icon_state = "stomach-c-u2"
desc = "An upgraded version of the cybernetic stomach, designed to improve further upon organic stomachs. Handles disgusting food very well."
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
disgust_metabolism = 3
emp_vulnerability = 3
/obj/item/organ/stomach/cybernetic/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people.
owner.vomit(stun = FALSE)
COOLDOWN_START(src, severe_cooldown, 10 SECONDS)
if(prob(severity/emp_vulnerability)) //Chance of permanent effects
organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon.
/obj/item/organ/stomach/ipc
name = "ipc cell"
icon_state = "stomach-ipc"
code/modules/uplink/uplink_items/uplink_bundles.dm
+2 -2
View File
@@ -135,7 +135,7 @@
but you never know. Contents are sorted to always be worth 50 TC."
item = /obj/structure/closet/crate
cost = 20
player_minimum = 25
player_minimum = 20
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/traitor/internal_affairs)
cant_discount = TRUE
var/starting_crate_value = 50
@@ -145,7 +145,7 @@
desc = "A dusty SUPER-SIZED from the back of the Syndicate warehouse. Rumored to contain a valuable assortment of items, \
but you never know. Contents are sorted to always be worth 125 TC."
cost = 40
player_minimum = 40
player_minimum = 30
starting_crate_value = 125
/datum/uplink_item/bundles_TC/surplus/purchase(mob/user, datum/component/uplink/U)
code/modules/uplink/uplink_items/uplink_roles.dm
+4 -3
View File
@@ -208,9 +208,10 @@
/datum/uplink_item/role_restricted/chemical_gun
name = "Reagent Dartgun"
desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. Can hold 100u of reagents."
desc = "A heavily modified syringe gun which is capable of synthesizing its own chemical darts using input reagents. \
Synthesizes one piercing 10 unit dart every 30 seconds up to a maximum of five. Can hold 100u of reagents."
item = /obj/item/gun/chem
cost = 12
cost = 10
restricted_roles = list("Chemist", "Chief Medical Officer")
/datum/uplink_item/role_restricted/reverse_bear_trap
@@ -257,4 +258,4 @@
item = /obj/item/storage/toolbox/emergency/turret
cost = 11
restricted_roles = list("Station Engineer")
code/modules/vending/_vending.dm
+1 -1
View File
@@ -55,7 +55,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
circuit = /obj/item/circuitboard/machine/vendor
payment_department = ACCOUNT_SRV
light_power = 0.5
light_power = 0.3
light_range = MINIMUM_USEFUL_LIGHT_RANGE
/// Is the machine active (No sales pitches if off)!
var/active = TRUE
html/changelog.html
+85
View File
@@ -50,6 +50,91 @@
-->
<div class="commit sansserif">
<h2 class="date">05 May 2021</h2>
<h3 class="author">The0bserver, with a great amount of advice from TripleZeta/TetraZeta updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Adds a new crate type, for use with any manner of cheeky breeki shenanigans, as well as with existing Russian contraband.</li>
</ul>
<h3 class="author">bunny232 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">There's some new vents and scrubbers in the meta station xenobiology department. Welders and wrenches not included*</li>
</ul>
<h3 class="author">keronshb updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Nightmare Shadow Jaunt threshold up to 0.4</li>
<li class="balance">Vendor and Engraved message light down to 0.3</li>
</ul>
<h2 class="date">03 May 2021</h2>
<h3 class="author">TripleShades updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added two air alarms to Pubby Security, one in the evidence locker room and one in the main equipment back room</li>
<li class="rscadd">pAI Card back to outside Research in Meta Station</li>
<li class="bugfix">Pubby Disposals now shunts to space</li>
<li class="bugfix">Maintinence Areas being not applied to certain airlocks as well as stealing minor walls</li>
<li class="bugfix">Box Surgery Storage camera is now renamed to be on the network</li>
<li class="bugfix">Box Paramedic Station camera is now renamed to be on the network, and no longer steals the Morgue's cam tweak: Box Surgery Storage is now it's own proper room</li>
</ul>
<h2 class="date">01 May 2021</h2>
<h3 class="author">qweq12yt updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Restores the sprite for the Riot Suit.</li>
</ul>
<h2 class="date">30 April 2021</h2>
<h3 class="author">DrPainis updated:</h3>
<ul class="changes bgimages16">
<li class="spellcheck">Bubblegum's hallucinations are capitalized.</li>
</ul>
<h3 class="author">Melbert, SandPoot updated:</h3>
<ul class="changes bgimages16">
<li class="refactor">TGUI Limbgrower</li>
<li class="refactor">Refactored the limbgrower to modernize the code and allow for more types of designs.</li>
<li class="rscadd">The limbgrower now supports plumbing ducts.</li>
<li class="bugfix">Fixes genitals not actually getting data from disks.</li>
<li class="code_imp">Adds two special helpers.</li>
</ul>
<h3 class="author">SandPoot updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">The decal painter now has visible previews for your tile painting funs.</li>
<li class="bugfix">Fixes decal painter painting in the opposite direction.</li>
</ul>
<h3 class="author">TheObserver-sys updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Restores the access lock on crates that should have them, given the goods inside.</li>
<li class="bugfix">Makes the 10MM Surplus Rifle a less awful thing to use.</li>
<li class="bugfix">replaces unarmored things with their armored versions.</li>
<li class="balance">Illegal Tech Ammo actually is fucking reasonable, now.</li>
<li class="balance">Expensive Illegal Tech Ammo Boxes are now constructible, with actually justifiable prices.</li>
</ul>
<h3 class="author">WanderingFox95 updated:</h3>
<ul class="changes bgimages16">
<li class="balance">There's finally a reason for the reagent dart gun to exist and be used!</li>
</ul>
<h3 class="author">akada updated:</h3>
<ul class="changes bgimages16">
<li class="imageadd">Changes the space adaptation sprite to something less intrusive and more subtle.</li>
</ul>
<h3 class="author">necromanceranne updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Basic cybernetic organs: they're worse than organic! Basic stomachs, hearts, lungs and livers! For when you hate someone enough to not bother harvesting organs from a monkeyhuman!</li>
<li class="rscadd">Cybernetic organs have been adjusted into three tiers: 1 (basic), 2 (standard, better than organic) and 3 (absolutely better than organic but expensive to print)</li>
<li class="rscadd">Cybernetic organs that are emp'd instead suffer different effects based on the severity of the emp. The bigger the emp, the worse the effect is.</li>
<li class="rscadd">Rather than outright bricking, severely emp'd cyberorgans degrade over time very quickly, requiring replacement in the near future.</li>
<li class="rscadd">Fake blindfolds in the loadout. They don't obscure vision, for better or worse.</li>
</ul>
<h2 class="date">29 April 2021</h2>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Fixed a couple runtimes in activity (threat) tracking</li>
</ul>
<h3 class="author">keronshb updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Removes the Reinforcement Chromosome from Genetics.</li>
</ul>
<h2 class="date">26 April 2021</h2>
<h3 class="author">Trigg, stylemistake and SandPoot updated:</h3>
<ul class="changes bgimages16">
html/changelogs/.all_changelog.yml
+69
View File
@@ -29172,3 +29172,72 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- admin: 'Admins just got a new TGUI Select Equipment menu tweak: Prevents the window
from creating sprites for any animated version there might be. (this guarantees
consistant sprite size/amount)'
2021-04-29:
Putnam3145:
- bugfix: Fixed a couple runtimes in activity (threat) tracking
keronshb:
- balance: Removes the Reinforcement Chromosome from Genetics.
2021-04-30:
DrPainis:
- spellcheck: Bubblegum's hallucinations are capitalized.
Melbert, SandPoot:
- refactor: TGUI Limbgrower
- refactor: Refactored the limbgrower to modernize the code and allow for more types
of designs.
- rscadd: The limbgrower now supports plumbing ducts.
- bugfix: Fixes genitals not actually getting data from disks.
- code_imp: Adds two special helpers.
SandPoot:
- rscadd: The decal painter now has visible previews for your tile painting funs.
- bugfix: Fixes decal painter painting in the opposite direction.
TheObserver-sys:
- bugfix: Restores the access lock on crates that should have them, given the goods
inside.
- bugfix: Makes the 10MM Surplus Rifle a less awful thing to use.
- bugfix: replaces unarmored things with their armored versions.
- balance: Illegal Tech Ammo actually is fucking reasonable, now.
- balance: Expensive Illegal Tech Ammo Boxes are now constructible, with actually
justifiable prices.
WanderingFox95:
- balance: There's finally a reason for the reagent dart gun to exist and be used!
akada:
- imageadd: Changes the space adaptation sprite to something less intrusive and
more subtle.
necromanceranne:
- rscadd: 'Basic cybernetic organs: they''re worse than organic! Basic stomachs,
hearts, lungs and livers! For when you hate someone enough to not bother harvesting
organs from a monkeyhuman!'
- rscadd: 'Cybernetic organs have been adjusted into three tiers: 1 (basic), 2 (standard,
better than organic) and 3 (absolutely better than organic but expensive to
print)'
- rscadd: Cybernetic organs that are emp'd instead suffer different effects based
on the severity of the emp. The bigger the emp, the worse the effect is.
- rscadd: Rather than outright bricking, severely emp'd cyberorgans degrade over
time very quickly, requiring replacement in the near future.
- rscadd: Fake blindfolds in the loadout. They don't obscure vision, for better
or worse.
2021-05-01:
qweq12yt:
- bugfix: Restores the sprite for the Riot Suit.
2021-05-03:
TripleShades:
- rscadd: Added two air alarms to Pubby Security, one in the evidence locker room
and one in the main equipment back room
- rscadd: pAI Card back to outside Research in Meta Station
- bugfix: Pubby Disposals now shunts to space
- bugfix: Maintinence Areas being not applied to certain airlocks as well as stealing
minor walls
- bugfix: Box Surgery Storage camera is now renamed to be on the network
- bugfix: 'Box Paramedic Station camera is now renamed to be on the network, and
no longer steals the Morgue''s cam tweak: Box Surgery Storage is now it''s own
proper room'
2021-05-05:
The0bserver, with a great amount of advice from TripleZeta/TetraZeta:
- rscadd: Adds a new crate type, for use with any manner of cheeky breeki shenanigans,
as well as with existing Russian contraband.
bunny232:
- rscadd: There's some new vents and scrubbers in the meta station xenobiology department.
Welders and wrenches not included*
keronshb:
- balance: Nightmare Shadow Jaunt threshold up to 0.4
- balance: Vendor and Engraved message light down to 0.3
icons/effects/genetics.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 23 KiB

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

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 26 KiB

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

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 12 KiB

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

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

icons/turf/decals.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

modular_citadel/code/modules/client/loadout/glasses.dm
+4
View File
@@ -6,6 +6,10 @@
name = "Blindfold"
path = /obj/item/clothing/glasses/sunglasses/blindfold
/datum/gear/glasses/fakeblindfold
name = "Fake Blindfold"
path = /obj/item/clothing/glasses/fakeblindfold
/datum/gear/glasses/cold
name = "Cold goggles"
path = /obj/item/clothing/glasses/cold
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+38 -10
View File
@@ -3,10 +3,9 @@
desc = "A gun magazine. Loaded with rounds which ignite the target.."
id = "10mminc"
build_type = PROTOLATHE
materials = list(/datum/material/plasma = 50000, /datum/material/iron = 18000)
reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240)
materials = list(/datum/material/plasma = 5000, /datum/material/iron = 7500)
build_path = /obj/item/ammo_box/magazine/m10mm/fire
category = list("Weapons")
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10mm
@@ -14,7 +13,7 @@
desc = "A gun magazine."
id = "10mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 55000)
materials = list(/datum/material/iron = 6000)
build_path = /obj/item/ammo_box/magazine/m10mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -24,8 +23,7 @@
desc = "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing."
id = "10mmhp"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 40000, /datum/material/glass = 50000)
reagents_list = list(/datum/reagent/sonic_powder = 280)
materials = list(/datum/material/iron = 7500, /datum/material/glass = 5000)
build_path = /obj/item/ammo_box/magazine/m10mm/hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -35,7 +33,7 @@
desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
id = "10mmap"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 40000, /datum/material/titanium = 60000)
materials = list(/datum/material/iron = 7500, /datum/material/titanium = 6500)
build_path = /obj/item/ammo_box/magazine/m10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -54,7 +52,7 @@
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 80000)
materials = list(/datum/material/iron = 8000)
build_path = /obj/item/ammo_box/magazine/m45
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -64,7 +62,7 @@
desc = "A gun magazine."
id = "pistolm9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 80000)
materials = list(/datum/material/iron = 7500)
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -84,7 +82,37 @@
desc = "A revolver speedloader. Cuts through like a hot knife through butter."
id = "sl357ap"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000)
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000)
build_path = /obj/item/ammo_box/a357/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10apbox
name = "ammo box (10mm Armour Piercing)"
desc = "A box of ammo containing 20 rounds designed to penetrate armor, at the cost of raw damage."
id = "m10apbox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 6000)
build_path = /obj/item/ammo_box/c10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10firebox
name = "ammo box (10mm Incendiary)"
desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage."
id = "m10firebox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/plasma = 6000)
build_path = /obj/item/ammo_box/c10mm/fire
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/m10hpbox
name = "ammo box (10mm Hollowpoint)"
desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor."
id = "m10hpbox"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 30000, /datum/material/glass = 6000)
build_path = /obj/item/ammo_box/c10mm/hp
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
tgui/packages/tgui/interfaces/DecalPainter.js
+57 -7
View File
@@ -1,6 +1,7 @@
import { useBackend } from '../backend';
import { Button, Section } from '../components';
import { Box, Button, Section } from '../components';
import { Window } from '../layouts';
import { classes } from 'common/react';
export const DecalPainter = (props, context) => {
const { act, data } = useBackend(context);
@@ -16,11 +17,25 @@ export const DecalPainter = (props, context) => {
{decal_list.map(decal => (
<Button
key={decal.decal}
content={decal.name}
style={{
width: '48px',
height: '48px',
padding: 0,
}}
selected={decal.decal === data.decal_style}
tooltip={decal.name}
onClick={() => act('select decal', {
decals: decal.decal,
})} />
})}>
<Box
className={classes([
'decals32x32',
data.decal_dir_text + '-' + decal.decal + (data.decal_color ? '_' + data.decal_color : ''),
])}
style={{
transform: 'scale(1.5) translate(17%, 17%)',
}} />
</Button>
))}
</Section>
<Section title="Decal Color">
@@ -28,7 +43,12 @@ export const DecalPainter = (props, context) => {
return (
<Button
key={color.colors}
content={color.colors === "red"
style={{
width: '48px',
height: '48px',
padding: 0,
}}
tooltip={color.colors === "red"
? "Red"
: color.colors === "white"
? "White"
@@ -36,7 +56,16 @@ export const DecalPainter = (props, context) => {
selected={color.colors === data.decal_color}
onClick={() => act('select color', {
colors: color.colors,
})} />
})}>
<Box
className={classes([
'decals32x32',
data.decal_dir_text + '-' + data.decal_style + (color.colors ? '_' + color.colors : ''),
])}
style={{
transform: 'scale(1.5) translate(17%, 17%)',
}} />
</Button>
);
})}
</Section>
@@ -45,7 +74,12 @@ export const DecalPainter = (props, context) => {
return (
<Button
key={dir.dirs}
content={dir.dirs === 1
style={{
width: '48px',
height: '48px',
padding: 0,
}}
tooltip={dir.dirs === 1
? "North"
: dir.dirs === 2
? "South"
@@ -55,7 +89,23 @@ export const DecalPainter = (props, context) => {
selected={dir.dirs === data.decal_direction}
onClick={() => act('selected direction', {
dirs: dir.dirs,
})} />
})}>
<Box
className={classes([
'decals32x32',
(dir.dirs === 1
? "north"
: dir.dirs === 2
? "south"
: dir.dirs === 4
? "east"
: "west")
+ '-' + data.decal_style + (data.decal_color ? '_' + data.decal_color : ''),
])}
style={{
transform: 'scale(1.5) translate(17%, 17%)',
}} />
</Button>
);
})}
</Section>
tgui/packages/tgui/interfaces/Limbgrower.js
+109
View File
@@ -0,0 +1,109 @@
import { useBackend, useSharedState } from '../backend';
import { Box, Button, Dimmer, Icon, LabeledList, Section, Tabs } from '../components';
import { Window } from '../layouts';
export const Limbgrower = (props, context) => {
const { act, data } = useBackend(context);
const {
reagents = [],
total_reagents,
max_reagents,
categories = [],
busy,
disk = [],
} = data;
const [tab, setTab] = useSharedState(
context, 'category', categories[0]?.name);
const designList = categories
.find(category => category.name === tab)
?.designs;
return (
<Window
title="Limb Grower"
width={500}
height={550}>
{!!busy && (
<Dimmer fontSize="32px">
<Icon name="cog" spin={1} />
{' Building...'}
</Dimmer>
)}
<Window.Content scrollable>
<Section title="Data Disk" buttons={
<Button
content="Eject Disk"
icon="eject"
onClick={() => act('eject_disk')}
disabled={!disk['disk']}
/>
}>
{disk['name'] ? (
<div>
Containing data for {disk['name']},<br />
Attempting to create genitalia will use the disk&apos;s data.
</div>
) : disk['disk'] ? "No data." : "No disk."}
</Section>
<Section title="Reagents">
<Box mb={1}>
{total_reagents} / {max_reagents} reagent capacity used.
</Box>
<LabeledList>
{reagents.map(reagent => (
<LabeledList.Item
key={reagent.reagent_name}
label={reagent.reagent_name}
buttons={(
<Button.Confirm
textAlign="center"
content="Remove Reagent"
icon="fill-drip"
color="bad"
onClick={() => act('empty_reagent', {
reagent_type: reagent.reagent_type,
})} />
)}>
{reagent.reagent_amount}u
</LabeledList.Item>
))}
</LabeledList>
</Section>
<Section title="Designs">
<Tabs>
{categories.map(category => (
<Tabs.Tab
fluid
key={category.name}
selected={tab === category.name}
onClick={() => setTab(category.name)}>
{category.name}
</Tabs.Tab>
))}
</Tabs>
<LabeledList>
{designList.map(design => (
<LabeledList.Item
key={design.name}
label={design.name}
buttons={(
<Button
content="Make"
onClick={() => act('make_limb', {
design_id: design.id,
active_tab: design.parent_category,
})} />
)}>
{design.needed_reagents.map(reagent => (
<Box key={reagent.name}>
{reagent.name}: {reagent.amount}u
</Box>
))}
</LabeledList.Item>
))}
</LabeledList>
</Section>
</Window.Content>
</Window>
);
};