mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-28 15:48:49 +01:00
Quick GB tweaks
This commit is contained in:
Casey
@@ -188,3 +188,27 @@
|
||||
prob(1);/obj/item/weapon/flame/lighter/random,
|
||||
prob(1);/obj/item/weapon/storage/wallet/random,
|
||||
prob(1);/obj/random/cutout)
|
||||
|
||||
/obj/random/instrument
|
||||
name = "random instrument"
|
||||
desc = "This is a random instrument."
|
||||
icon = 'icons/obj/musician.dmi'
|
||||
icon_state = "violin"
|
||||
spawn_nothing_percentage = 0
|
||||
|
||||
/obj/random/instrument/item_to_spawn()
|
||||
return pick(prob(5);/obj/item/instrument/violin,
|
||||
prob(5);/obj/item/instrument/banjo,
|
||||
prob(5);/obj/item/instrument/guitar,
|
||||
prob(5);/obj/item/instrument/eguitar,
|
||||
prob(5);/obj/item/instrument/accordion,
|
||||
prob(5);/obj/item/instrument/trumpet,
|
||||
prob(5);/obj/item/instrument/saxophone,
|
||||
prob(5);/obj/item/instrument/trombone,
|
||||
prob(5);/obj/item/instrument/recorder,
|
||||
prob(5);/obj/item/instrument/harmonica,
|
||||
prob(1);/obj/item/instrument/bikehorn,
|
||||
prob(5);/obj/item/instrument/piano_synth,
|
||||
prob(5);/obj/item/instrument/glockenspiel,
|
||||
prob(1);/obj/item/instrument/musicalmoth
|
||||
)
|
||||
|
||||
+125
-11
@@ -51,6 +51,9 @@ lel
|
||||
/obj/machinery/computer/arcade/battle{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/civilian/bar)
|
||||
"ah" = (
|
||||
@@ -1140,6 +1143,12 @@ lel
|
||||
/obj/effect/landmark/start/medical,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/office)
|
||||
"cT" = (
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/civilian/bar)
|
||||
"cU" = (
|
||||
/obj/item/weapon/stock_parts/manipulator,
|
||||
/obj/item/weapon/stock_parts/matter_bin,
|
||||
@@ -2070,6 +2079,9 @@ lel
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
/area/groundbase/civilian/cafe)
|
||||
"fk" = (
|
||||
@@ -2800,6 +2812,13 @@ lel
|
||||
"gW" = (
|
||||
/turf/simulated/floor/lino,
|
||||
/area/groundbase/civilian/cafe)
|
||||
"gX" = (
|
||||
/obj/structure/table/bench/padded,
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/civilian/bar)
|
||||
"gY" = (
|
||||
/obj/machinery/telecomms/hub/preset/groundbase,
|
||||
/turf/simulated/floor/tiled/dark{
|
||||
@@ -3070,6 +3089,9 @@ lel
|
||||
/turf/simulated/wall,
|
||||
/area/groundbase/medical/resleeving)
|
||||
"hM" = (
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/medical/autoresleeving)
|
||||
"hN" = (
|
||||
@@ -3449,6 +3471,12 @@ lel
|
||||
"iH" = (
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/maintenance/groundbase/level1/netunnel)
|
||||
"iI" = (
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/security/briefing)
|
||||
"iJ" = (
|
||||
/obj/structure/table/rack{
|
||||
dir = 8;
|
||||
@@ -3486,6 +3514,15 @@ lel
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/engine)
|
||||
"iO" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/equipment)
|
||||
"iP" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
@@ -6108,6 +6145,10 @@ lel
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Engineering"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/lobby)
|
||||
"pf" = (
|
||||
@@ -6833,6 +6874,9 @@ lel
|
||||
/obj/structure/bed/chair/wood{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/cafe)
|
||||
"qY" = (
|
||||
@@ -7262,6 +7306,15 @@ lel
|
||||
/obj/machinery/portable_atmospherics/powered/pump/filled,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/groundbase/engineering/atmos)
|
||||
"rS" = (
|
||||
/obj/structure/closet/walllocker_double{
|
||||
pixel_y = 28
|
||||
},
|
||||
/obj/random/instrument,
|
||||
/obj/random/instrument,
|
||||
/obj/item/instrument/guitar,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/gameroom)
|
||||
"rT" = (
|
||||
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
|
||||
outdoors = 0
|
||||
@@ -8658,6 +8711,9 @@ lel
|
||||
/obj/machinery/alarm{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/lino,
|
||||
/area/groundbase/civilian/cafe)
|
||||
"vp" = (
|
||||
@@ -8974,6 +9030,9 @@ lel
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/security/halle)
|
||||
"vZ" = (
|
||||
@@ -13560,6 +13619,12 @@ lel
|
||||
/obj/machinery/chemical_dispenser/bar_alc/full,
|
||||
/turf/simulated/floor/lino,
|
||||
/area/groundbase/civilian/bar)
|
||||
"GS" = (
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/security/warden)
|
||||
"GT" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "4-8"
|
||||
@@ -13587,6 +13652,12 @@ lel
|
||||
},
|
||||
/turf/simulated/floor/carpet/sblucarpet,
|
||||
/area/groundbase/security/iaa2)
|
||||
"GW" = (
|
||||
/obj/structure/sign/painting/public{
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/gameroom)
|
||||
"GX" = (
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
@@ -13714,6 +13785,13 @@ lel
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/disposalpipe/segment,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_x = -30
|
||||
},
|
||||
>>>>>>> 8a68e2bd53... Merge pull request #12856 from Very-Soft/somequicktweaks
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/medical/resleeving)
|
||||
"Hl" = (
|
||||
@@ -14529,8 +14607,17 @@ lel
|
||||
/obj/item/device/suit_cooling_unit,
|
||||
/obj/item/device/suit_cooling_unit,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/eva)
|
||||
"Jl" = (
|
||||
/obj/structure/sign/painting/public{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/gameroom)
|
||||
"Jm" = (
|
||||
/obj/machinery/camera/network/civilian{
|
||||
dir = 1
|
||||
@@ -15330,6 +15417,7 @@ lel
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
|
||||
/obj/item/weapon/hand_labeler,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/security/briefing)
|
||||
"Le" = (
|
||||
@@ -15472,6 +15560,9 @@ lel
|
||||
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/security/halle)
|
||||
"Lv" = (
|
||||
@@ -17500,6 +17591,15 @@ lel
|
||||
},
|
||||
/turf/simulated/floor/bmarble,
|
||||
/area/groundbase/engineering/engine)
|
||||
"QF" = (
|
||||
/obj/structure/bed/chair/backed_red{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/sign/painting/public{
|
||||
pixel_x = -30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/gameroom)
|
||||
"QG" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/black{
|
||||
dir = 4
|
||||
@@ -17515,6 +17615,8 @@ lel
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/device/sleevemate,
|
||||
/obj/item/device/denecrotizer/medical,
|
||||
/obj/item/bodybag/cryobag,
|
||||
/obj/item/bodybag/cryobag,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/equipment)
|
||||
"QI" = (
|
||||
@@ -18089,6 +18191,12 @@ lel
|
||||
outdoors = 0
|
||||
},
|
||||
/area/groundbase/command/ai/foyer)
|
||||
"Sd" = (
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/lhallway)
|
||||
"Se" = (
|
||||
/obj/effect/floor_decal/industrial/danger{
|
||||
dir = 8
|
||||
@@ -18416,6 +18524,9 @@ lel
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/cafe)
|
||||
"SP" = (
|
||||
@@ -20375,6 +20486,9 @@ lel
|
||||
/area/groundbase/command/tcomms/foyer)
|
||||
"XJ" = (
|
||||
/obj/structure/closet/secure_closet/engineering_personal,
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_x = 30
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/engineering/workshop)
|
||||
"XK" = (
|
||||
@@ -25123,7 +25237,7 @@ AE
|
||||
Hq
|
||||
tu
|
||||
vV
|
||||
ut
|
||||
gX
|
||||
ut
|
||||
yA
|
||||
pj
|
||||
@@ -25256,7 +25370,7 @@ Fi
|
||||
FF
|
||||
MO
|
||||
pj
|
||||
ht
|
||||
cT
|
||||
vV
|
||||
AA
|
||||
ut
|
||||
@@ -26024,7 +26138,7 @@ eR
|
||||
eR
|
||||
AZ
|
||||
cv
|
||||
AN
|
||||
iI
|
||||
kh
|
||||
jx
|
||||
az
|
||||
@@ -26605,7 +26719,7 @@ JA
|
||||
Ea
|
||||
TC
|
||||
iw
|
||||
Pl
|
||||
GS
|
||||
HW
|
||||
uZ
|
||||
tw
|
||||
@@ -26960,7 +27074,7 @@ ce
|
||||
ce
|
||||
ce
|
||||
pj
|
||||
ht
|
||||
cT
|
||||
vV
|
||||
AA
|
||||
ut
|
||||
@@ -29380,13 +29494,13 @@ MO
|
||||
MO
|
||||
MO
|
||||
hq
|
||||
Yl
|
||||
GW
|
||||
Me
|
||||
Hl
|
||||
AH
|
||||
Yl
|
||||
Yl
|
||||
cr
|
||||
QF
|
||||
hq
|
||||
lE
|
||||
lE
|
||||
@@ -29812,7 +29926,7 @@ tb
|
||||
Fn
|
||||
kC
|
||||
Yl
|
||||
Yl
|
||||
Jl
|
||||
hq
|
||||
lE
|
||||
vw
|
||||
@@ -29948,7 +30062,7 @@ Ym
|
||||
oS
|
||||
vL
|
||||
hq
|
||||
Yl
|
||||
rS
|
||||
uJ
|
||||
oI
|
||||
kr
|
||||
@@ -33932,7 +34046,7 @@ Tn
|
||||
QC
|
||||
Dx
|
||||
QC
|
||||
qA
|
||||
iO
|
||||
DQ
|
||||
oi
|
||||
ze
|
||||
@@ -34494,7 +34608,7 @@ Ni
|
||||
jz
|
||||
qC
|
||||
ox
|
||||
wA
|
||||
Sd
|
||||
DQ
|
||||
KY
|
||||
jw
|
||||
|
||||
@@ -675,6 +675,9 @@
|
||||
/obj/item/weapon/disk/nuclear{
|
||||
name = "authentication disk"
|
||||
},
|
||||
/obj/machinery/light/small{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/command/captainq)
|
||||
"bQ" = (
|
||||
@@ -4170,7 +4173,7 @@
|
||||
"mo" = (
|
||||
/obj/structure/table/woodentable,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Library Conference Room"
|
||||
department = "Library"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/civilian/library)
|
||||
@@ -4383,6 +4386,12 @@
|
||||
/obj/item/weapon/material/minihoe,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/science/xenobot)
|
||||
"mX" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/groundbase/command/captainq)
|
||||
"mY" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
@@ -10483,6 +10492,13 @@
|
||||
/obj/item/weapon/storage/box/monkeycubes/wolpincubes,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/medical/virology)
|
||||
"FC" = (
|
||||
/obj/machinery/chem_master,
|
||||
/obj/structure/sign/painting/library_secure{
|
||||
pixel_y = -30
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/medical/Chemistry)
|
||||
"FD" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 1;
|
||||
@@ -12500,6 +12516,11 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 9
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Research";
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/science/rnd)
|
||||
"Lt" = (
|
||||
@@ -13828,6 +13849,10 @@
|
||||
sortType = "Trash"
|
||||
},
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/photocopier/faxmachine{
|
||||
department = "Cargo";
|
||||
pixel_y = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/cargo/office)
|
||||
"Pc" = (
|
||||
@@ -14515,7 +14540,7 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/command/hall)
|
||||
"QY" = (
|
||||
/obj/machinery/vending/fitness,
|
||||
/obj/random/vendorall,
|
||||
/obj/machinery/light/small{
|
||||
dir = 1
|
||||
},
|
||||
@@ -30848,7 +30873,7 @@ tt
|
||||
bx
|
||||
Yu
|
||||
Ur
|
||||
nS
|
||||
FC
|
||||
sW
|
||||
TU
|
||||
RJ
|
||||
@@ -32018,7 +32043,7 @@ Bo
|
||||
ia
|
||||
nz
|
||||
no
|
||||
XW
|
||||
mX
|
||||
ow
|
||||
ia
|
||||
kr
|
||||
|
||||
+22813
-1
File diff suppressed because it is too large
Load Diff
@@ -437,33 +437,42 @@
|
||||
limit_mob_size = FALSE
|
||||
block_suit_sensors = TRUE
|
||||
forbid_events = TRUE
|
||||
|
||||
/area/groundbase/dorms/bathroom
|
||||
name = "Dormitory Bathroom"
|
||||
sound_env = SOUND_ENVIRONMENT_BATHROOM
|
||||
/area/groundbase/dorms/room1
|
||||
name = "Dorm Room 1"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room2
|
||||
name = "Dorm Room 2"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room3
|
||||
name = "Dorm Room 3"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room4
|
||||
name = "Dorm Room 4"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room5
|
||||
name = "Dorm Room 5"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room6
|
||||
name = "Dorm Room 6"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room7
|
||||
name = "Dorm Room 7"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
/area/groundbase/dorms/room8
|
||||
name = "Dorm Room 8"
|
||||
lightswitch = 0
|
||||
sound_env = SMALL_SOFTFLOOR
|
||||
|
||||
/area/maintenance/groundbase/substation
|
||||
name = "Substation"
|
||||
|
||||
Reference in New Issue
Block a user