cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 00:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes conflicts.

Browse Source 
Update ss13_construct.json

AAAAAAAAAAA

maybe this will work.

Update _basemap.dm

Update _basemap.dm

here is the failure.

Update ss13_construct.json

more CI

weee more linters

one more god damn linter

more linters

I might as well fix CI too

Fixes map linters

Guardians was converted to a basic mob

Fixes broken procs
This commit is contained in:
StrangeWeirdKitten
2023-11-20 17:07:11 -07:00
parent f2b71e7686
commit de2a396d7d
15 changed files with 67 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm
+1 -2
View File
@@ -1740,7 +1740,6 @@
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/bubbers/dauntless/command/admiral)
"kn" = (
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
/obj/structure/window/reinforced/survival_pod/spawner/directional/south,
/obj/effect/turf_decal/vg_decals/numbers/four,
/obj/structure/window/reinforced/survival_pod/spawner/directional/west,
@@ -8724,7 +8723,7 @@
/area/ruin/space/has_grav/bubbers/dauntless/service/hydro)
"RV" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase/white{
/obj/item/storage/briefcase/secure/white{
pixel_y = 13
},
/obj/effect/spawner/random/bureaucracy/folder{
_maps/_basemap.dm
+1
View File
@@ -22,6 +22,7 @@
#include "map_files\LimaStation\LimaStation.dmm"
#include "map_files\burgerstation\burgerstation.dmm"
#include "map_files\KiloStation\KiloStation.dmm"
#include "map_files\ss13construct\ss13_construct.dmm"
// BUBBER EDIT ADDITION END
#ifdef CIBUILDING
_maps/map_files/KiloStation/KiloStation.dmm
+10 -13
View File
@@ -6457,7 +6457,7 @@
/area/station/maintenance/department/crew_quarters/bar)
"cjq" = (
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase{
/obj/item/storage/briefcase/secure{
pixel_y = 6
},
/obj/item/radio{
@@ -8041,7 +8041,6 @@
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/west,
/obj/machinery/airalarm/directional/west,
/obj/machinery/power/shieldwallgen,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
@@ -23641,7 +23640,6 @@
/obj/machinery/power/shieldwallgen,
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/power/shieldwallgen,
/obj/machinery/light_switch/directional/west,
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/iron/dark,
@@ -28306,7 +28304,7 @@
"jfK" = (
/obj/structure/table/glass,
/obj/item/stack/package_wrap,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/item/hand_labeler,
/obj/item/reagent_containers/spray/cleaner,
/obj/structure/cable,
@@ -30272,7 +30270,7 @@
"jPq" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/cobweb,
/obj/item/storage/secure/briefcase{
/obj/item/storage/briefcase/secure{
pixel_y = 4
},
/obj/item/radio{
@@ -35290,7 +35288,7 @@
/obj/machinery/firealarm/directional/west,
/obj/machinery/newscaster/directional/south,
/obj/item/stack/package_wrap,
/obj/item/storage/secure/briefcase{
/obj/item/storage/briefcase/secure{
pixel_y = 4
},
/obj/item/hand_labeler,
@@ -37561,7 +37559,7 @@
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/effect/turf_decal/tile/red{
dir = 4
},
@@ -41145,7 +41143,7 @@
"nvA" = (
/obj/machinery/suit_storage_unit/hos,
/obj/effect/turf_decal/delivery,
/obj/item/storage/secure/safe/hos{
/obj/structure/secure_safe/hos{
pixel_x = 36;
pixel_y = 28
},
@@ -43764,7 +43762,7 @@
/area/station/service/library)
"otO" = (
/obj/structure/table,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/item/taperecorder,
/obj/structure/sign/warning/electric_shock/directional/south,
/turf/open/floor/iron/dark,
@@ -45557,7 +45555,7 @@
/obj/structure/table,
/obj/item/healthanalyzer,
/obj/item/hand_labeler,
/obj/item/storage/secure/safe/caps_spare/directional/north,
/obj/structure/secure_safe/caps_spare/directional/north,
/obj/effect/turf_decal/tile/yellow/half/contrasted{
dir = 1
},
@@ -53195,7 +53193,7 @@
/area/station/service/chapel)
"rxt" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase{
/obj/item/storage/briefcase/secure{
pixel_x = 5;
pixel_y = 5
},
@@ -65330,7 +65328,7 @@
},
/obj/machinery/light/directional/east,
/obj/item/lighter,
/obj/item/storage/secure/safe/directional/east,
/obj/structure/secure_safe/directional/east,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -69983,7 +69981,6 @@
/obj/machinery/power/shieldwallgen,
/obj/effect/turf_decal/bot,
/obj/machinery/firealarm/directional/west,
/obj/machinery/power/shieldwallgen,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 4
},
_maps/map_files/LimaStation/LimaStation.dmm
+15 -29
View File
@@ -1963,7 +1963,7 @@
/turf/open/openspace,
/area/station/engineering/lobby)
"aSA" = (
/obj/item/storage/secure/safe{
/obj/structure/secure_safe{
pixel_x = -23;
pixel_y = 32
},
@@ -2753,7 +2753,6 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/obj/machinery/iv_drip,
/turf/open/floor/iron/white,
/area/station/medical/storage)
"biB" = (
@@ -19474,19 +19473,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/station/hallway/secondary/command)
"hEL" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "Brig Shutters"
},
/obj/machinery/door/poddoor/preopen{
id = "Secure Gate";
name = "Brig Shutters"
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/holding_cell)
"hEV" = (
/obj/structure/chair/comfy/brown{
dir = 1
@@ -20201,7 +20187,7 @@
/area/station/maintenance/port/lower)
"hTS" = (
/obj/structure/table/glass,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/turf/open/floor/carpet/royalblue,
/area/station/command/bridge)
"hUg" = (
@@ -23581,7 +23567,7 @@
/turf/open/floor/wood,
/area/station/service/bar/lower)
"jma" = (
/obj/item/storage/secure/safe{
/obj/structure/secure_safe{
pixel_x = -23
},
/turf/open/floor/iron/dark/smooth_large,
@@ -28994,7 +28980,7 @@
/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{
pixel_x = -6
},
/obj/item/storage/secure/safe/hos{
/obj/structure/secure_safe/hos{
pixel_y = 28
},
/turf/open/floor/carpet/red,
@@ -37621,7 +37607,7 @@
"oqX" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/secure_closet/personal,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/effect/turf_decal/tile/brown/opposingcorners{
dir = 1
},
@@ -47202,7 +47188,7 @@
/obj/effect/turf_decal/bot,
/obj/structure/closet/secure_closet/nanotrasen_consultant/station,
/obj/item/clothing/gloves/combat/naval,
/obj/item/storage/secure/briefcase/white,
/obj/item/storage/briefcase/secure/white,
/obj/item/clothing/accessory/medal/gold/ordom,
/turf/open/floor/wood/large,
/area/station/command/heads_quarters/nt_rep)
@@ -56802,7 +56788,7 @@
/area/station/science/robotics/lab)
"vvu" = (
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/item/crowbar,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -59808,7 +59794,7 @@
/obj/machinery/computer/monitor{
dir = 4
},
/obj/item/storage/secure/safe/caps_spare{
/obj/structure/secure_safe/caps_spare{
pixel_x = -27
},
/obj/effect/turf_decal/trimline/yellow/filled/line{
@@ -63188,7 +63174,7 @@
/turf/open/floor/plating,
/area/station/maintenance/department/medical)
"xWQ" = (
/obj/item/storage/secure/safe{
/obj/structure/secure_safe{
pixel_x = -23
},
/obj/machinery/photocopier,
@@ -152439,7 +152425,7 @@ nuB
eqe
ofZ
mhf
hEL
rve
jYK
xeD
dBw
@@ -152696,7 +152682,7 @@ bkT
meV
jjp
uKL
hEL
rve
uUj
xeD
dBw
@@ -153210,7 +153196,7 @@ nuB
ibL
ofZ
mhf
hEL
rve
lJL
xeD
rMB
@@ -153467,7 +153453,7 @@ pZx
meV
jjp
fWR
hEL
rve
uUj
xeD
wNN
@@ -153981,7 +153967,7 @@ nuB
xrf
ofZ
mhf
hEL
rve
lJL
xeD
sfC
@@ -154238,7 +154224,7 @@ oJs
meV
jjp
alp
hEL
rve
uUj
xeD
sfC
_maps/map_files/biodome/biodome.dmm
+13 -38
View File
@@ -1017,7 +1017,7 @@
/area/station/command/heads_quarters/hop)
"arf" = (
/obj/structure/disposalpipe/segment,
/obj/item/storage/secure/safe/directional/west,
/obj/structure/secure_safe/directional/west,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3490,12 +3490,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark/smooth_large,
/area/station/medical/morgue)
"biW" = (
/obj/effect/turf_decal/tile/dark_green/full,
/obj/machinery/oven/range,
/obj/machinery/oven/range,
/turf/open/floor/iron/white/smooth_large,
/area/station/service/kitchen)
"bjh" = (
/turf/open/misc/dirt/jungle/dark,
/area/station/maintenance/central/greater)
@@ -5293,7 +5287,7 @@
"bPQ" = (
/obj/structure/table/wood,
/obj/item/storage/lockbox/medal,
/obj/item/storage/secure/briefcase{
/obj/item/storage/briefcase/secure{
pixel_x = -2;
pixel_y = 4
},
@@ -7605,7 +7599,7 @@
c_tag = "Command - Captain's Office"
},
/obj/structure/cable,
/obj/item/storage/secure/safe/directional/east,
/obj/structure/secure_safe/directional/east,
/obj/machinery/duct,
/obj/effect/turf_decal/siding/yellow/corner{
dir = 8
@@ -9531,7 +9525,7 @@
/area/station/cargo/sorting)
"dnp" = (
/obj/structure/table/reinforced,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/item/storage/box/pdas{
pixel_x = 4;
pixel_y = 4
@@ -13116,10 +13110,6 @@
name = "Space Shutters"
},
/obj/structure/cable,
/obj/machinery/door/poddoor/preopen{
id = "hosspace";
name = "Space Shutters"
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/hos)
"eBy" = (
@@ -15918,18 +15908,6 @@
/obj/structure/disposaloutlet,
/turf/open/floor/engine,
/area/station/science/xenobiology)
"fwE" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/preopen{
id = "rdoffice";
name = "Research Director's Shutters"
},
/obj/machinery/door/poddoor/preopen{
id = "rdoffice";
name = "Research Director's Shutters"
},
/turf/open/floor/plating,
/area/station/command/heads_quarters/rd)
"fwG" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel"
@@ -24333,9 +24311,6 @@
"iyR" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood,
/obj/machinery/door/window/left/directional/east{
req_one_access = list("service","maint_tunnels")
},
/obj/machinery/door/window/left/directional/east{
req_one_access = list("service","maint_tunnels")
},
@@ -35084,7 +35059,7 @@
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/turf/open/floor/grass,
/area/station/security/courtroom)
"meh" = (
@@ -36127,7 +36102,7 @@
"mvU" = (
/obj/structure/table/reinforced,
/obj/item/aicard,
/obj/item/storage/secure/safe/caps_spare/directional/west,
/obj/structure/secure_safe/caps_spare/directional/west,
/obj/effect/turf_decal/tile/neutral/half/contrasted{
dir = 8
},
@@ -49318,7 +49293,7 @@
/obj/machinery/camera/motion/directional/east{
c_tag = "Security - Secure Armory"
},
/obj/item/storage/secure/safe/directional/east,
/obj/structure/secure_safe/directional/east,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 4
},
@@ -64656,7 +64631,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/item/storage/secure/safe/directional/east,
/obj/structure/secure_safe/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/evidence)
@@ -103371,7 +103346,7 @@ vHU
lpd
ebK
vrS
biW
eHD
vrS
xkU
ldW
@@ -169897,7 +169872,7 @@ upO
pPe
tcQ
dCg
fwE
uES
glS
tQF
fAz
@@ -178749,7 +178724,7 @@ cMB
qNT
xsl
asv
eBh
mAL
rRv
rRv
hNy
@@ -180033,8 +180008,8 @@ vTi
mAL
eBh
eBh
eBh
eBh
mAL
mAL
rRv
rRv
hNy
_maps/map_files/burgerstation/burgerstation.dmm
+12 -14
View File
@@ -671,7 +671,7 @@
/area/station/command/gateway)
"amg" = (
/obj/structure/table/wood,
/obj/item/storage/secure/briefcase,
/obj/item/storage/briefcase/secure,
/obj/item/grenade/smokebomb,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/sign/poster/random/directional/north,
@@ -4474,7 +4474,7 @@
/turf/open/floor/iron,
/area/station/service/janitor)
"bGa" = (
/obj/item/storage/secure/safe/sc_ssafe{
/obj/structure/secure_safe/sc_ssafe{
pixel_x = -25
},
/obj/machinery/photocopier,
@@ -20913,7 +20913,7 @@
},
/area/station/asteroid)
"hln" = (
/obj/item/storage/secure/safe/directional/south,
/obj/structure/secure_safe/directional/south,
/obj/machinery/computer/aifixer{
dir = 4
},
@@ -27891,7 +27891,7 @@
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/supplies,
/obj/item/storage/secure/safe/directional/north,
/obj/structure/secure_safe/directional/north,
/turf/open/floor/iron/white,
/area/station/command/heads_quarters/cmo)
"jKa" = (
@@ -30481,7 +30481,6 @@
/area/station/cargo/storage)
"kCO" = (
/obj/machinery/hydroponics/soil,
/obj/machinery/hydroponics/soil,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/directional/north,
/obj/effect/spawner/random/food_or_drink/seed,
@@ -32476,7 +32475,7 @@
/turf/open/floor/iron,
/area/station/commons/storage/primary)
"ljM" = (
/obj/item/storage/secure/safe/directional/north{
/obj/structure/secure_safe/directional/north{
name = "evidence safe"
},
/obj/structure/closet/secure_closet/evidence,
@@ -33672,7 +33671,7 @@
/turf/open/floor/iron/freezer,
/area/station/medical/cryo)
"lFk" = (
/obj/item/storage/secure/safe/directional/north,
/obj/structure/secure_safe/directional/north,
/obj/effect/turf_decal/siding/dark{
dir = 8
},
@@ -45467,7 +45466,7 @@
fax_name = "Head of Personnel's Office";
name = "Head of Personnel's Fax Machine"
},
/obj/item/storage/secure/safe/directional/west,
/obj/structure/secure_safe/directional/west,
/turf/open/floor/wood,
/area/station/command/heads_quarters/hop)
"pJw" = (
@@ -51312,7 +51311,7 @@
/area/station/maintenance/starboard/central)
"rFq" = (
/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
/obj/item/storage/secure/safe/caps_spare/directional/south,
/obj/structure/secure_safe/caps_spare/directional/south,
/turf/open/floor/iron/dark,
/area/station/command)
"rFw" = (
@@ -51847,7 +51846,7 @@
"rOV" = (
/obj/structure/closet/secure_closet/hos,
/obj/structure/cable,
/obj/item/storage/secure/safe/hos{
/obj/structure/secure_safe/hos{
pixel_y = 31
},
/turf/open/floor/wood,
@@ -52545,7 +52544,7 @@
/area/station/engineering/atmos)
"sdw" = (
/obj/structure/closet/secure_closet/security/sec,
/obj/item/storage/secure/safe/directional/west,
/obj/structure/secure_safe/directional/west,
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
@@ -61423,7 +61422,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/storage/secure/safe/directional/north,
/obj/structure/secure_safe/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/dark,
/area/station/ai_monitored/security/armory)
@@ -63738,7 +63737,7 @@
/obj/effect/turf_decal/siding/dark{
dir = 6
},
/obj/item/storage/secure/safe/directional/east,
/obj/structure/secure_safe/directional/east,
/turf/open/floor/mineral/gold,
/area/station/command/heads_quarters/qm)
"vVN" = (
@@ -66563,7 +66562,6 @@
/area/station/engineering/supermatter/room)
"wTT" = (
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/structure/table,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/button/door{
_maps/map_files/debug/ss13_construct.dmm → _maps/map_files/ss13construct/ss13_construct.dmm
View File
_maps/shuttles/zubbers/emergency_burgerstation.dmm
+1 -9
View File
@@ -902,14 +902,6 @@
/obj/effect/spawner/random/structure/table_fancy,
/turf/open/floor/carpet/orange,
/area/shuttle/escape/luxury)
"BF" = (
/obj/machinery/status_display/shuttle/directional/south,
/obj/machinery/status_display/shuttle/directional/south,
/obj/machinery/status_display/shuttle/directional/south,
/obj/machinery/status_display/shuttle/directional/south,
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/mineral/titanium,
/area/shuttle/escape)
"BP" = (
/turf/open/floor/mineral/titanium/tiled/white,
/area/shuttle/escape)
@@ -1695,7 +1687,7 @@ tq
tq
na
nx
BF
Ih
tq
pF
xZ
_maps/ss13_construct.json
+4 -3
View File
@@ -1,7 +1,7 @@
{
"version": 1,
"map_name": "SS13 Construct",
"map_path": "map_files/debug",
"map_path": "map_files/ss13construct",
"map_file": "ss13_construct.dmm",
"space_ruin_levels": 0,
"space_empty_levels": 0,
@@ -10,11 +10,12 @@
"ignored_unit_tests": [
"/datum/unit_test/job_roundstart_spawnpoints",
"/datum/unit_test/required_map_items",
"/datum/unit_test/run_linters",
"/datum/unit_test/antag_moodlets",
"/datum/unit_test/space_dragon_expiration",
"/datum/unit_test/traitor",
"/datum/unit_test/area_spawn",
"/datum/unit_test/mapload_space_verification"
"/datum/unit_test/mapload_space_verification",
"/datum/unit_test/breath/breath_sanity_ashwalker",
"/datum/unit_test/lungs/lungs_sanity_ashwalker"
]
}
code/game/machinery/doors/firedoor.dm
+1 -1
View File
@@ -272,7 +272,7 @@
/obj/machinery/door/firedoor/proc/adjacent_change(turf/changed, path, list/new_baseturfs, flags, list/post_change_callbacks)
SIGNAL_HANDLER
post_change_callbacks += CALLBACK(src, PROC_REF(CalculateAffectingAreas))
post_change_callbacks += CALLBACK(src, PROC_REF(process_results), changed) //check the atmosphere of the changed turf so we don't hold onto alarm if a wall is built
// post_change_callbacks += CALLBACK(src, PROC_REF(process_results), changed) // BUBBERSTATION CHANGE: FIRELOCKS ARE NO LONGER ARE FREE-THINKERS. //check the atmosphere of the changed turf so we don't hold onto alarm if a wall is built
/* BUBBERSTATION CHANGE: FIRELOCKS ARE NO LONGER ARE FREE-THINKERS.
/obj/machinery/door/firedoor/proc/check_atmos(turf/checked_turf)
config/maps.txt
-6
View File
@@ -81,14 +81,8 @@ map burgerstation
endmap
map ss13_construct
votable
endmap
map kilostation
votable
endmap
map blueshift
minplayers 70
votable
endmap
modular_skyrat/master_files/code/datums/quirks/negative.dm
+5 -5
View File
@@ -88,13 +88,13 @@
return bd_synth.add_to_holder(new_holder, quirk_transfer)
/datum/quirk/gifted
name = "Gifted"
desc = "You were born a bit lucky, intelligent, or something in between. You're able to do a little more."
name = "Experienced" // Bubberstation Edit
desc = "You have a wider, crushing experience working onboard the station." // Bubberstation Edit
icon = FA_ICON_DOVE
quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_HIDE_FROM_SCAN
value = -6
mob_trait = TRAIT_GIFTED
gain_text = span_danger("You feel like you're just a little bit more flexible.")
lose_text = span_notice("You feel a little less flexible.")
medical_record_text = "Patient has a history of uncanny fortune."
gain_text = span_danger("Your skills feel like you're just a little bit more flexible.") // Bubberstation Edit
lose_text = span_notice("Your skills feel a little less flexible.") // Bubberstation Edit
medical_record_text = "Patient has a history of uncanny experience" // Bubberstation Edit
hardcore_value = 0
modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm
+2 -2
View File
@@ -67,12 +67,12 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
/obj/item/storage/belt/utility/xenoarch = 5,
/obj/item/storage/belt/wands = 1,
/obj/item/storage/briefcase = 100,
/obj/item/storage/secure/briefcase = 50,
/obj/item/storage/briefcase/secure = 50,
/obj/item/storage/briefcase/empty = 25,
/obj/item/storage/briefcase/lawyer = 25,
/obj/item/storage/briefcase/medical = 25,
/obj/item/storage/briefcase/virology = 25,
/obj/item/storage/secure/briefcase/syndie = 1
/obj/item/storage/briefcase/secure/syndie = 1
) = 100,
list(
/obj/item/stock_parts/capacitor = 100,
modular_zubbers/code/modules/debug_tools/toolgun_module/phys_build.dm
+1 -1
View File
@@ -53,7 +53,7 @@
user.balloon_alert(user, "Blocked!")
return FALSE
if(!isturf(selected_atom))
T.PlaceOnTop(selected_atom)
T.place_on_top(selected_atom)
return TRUE
T.TerraformTurf(selected_atom, selected_atom, flags = CHANGETURF_INHERIT_AIR)
return TRUE
modular_zubbers/code/modules/mob/living/simple_animal/guardian/guardian.dm
+1 -1
View File
@@ -1,2 +1,2 @@
/mob/living/simple_animal/hostile/guardian
/mob/living/basic/guardian
lighting_cutoff = LIGHTING_CUTOFF_HIGH