Fix Travis grep script to use PCRE to actually match things (#47065)

Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
This commit is contained in:
spookydonut
2019-10-20 01:21:05 +08:00
committed by Tad Hardesty
parent 9aac0ab34e
commit 4e8ff18b07
92 changed files with 136 additions and 210 deletions

View File

@@ -16,6 +16,7 @@ matrix:
- python3 - python3
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- pcregrep
install: install:
- tools/travis/install_build_tools.sh - tools/travis/install_build_tools.sh
- tools/travis/install_spaceman_dmm.sh dreamchecker - tools/travis/install_spaceman_dmm.sh dreamchecker

View File

@@ -12919,9 +12919,7 @@
/area/science/xenobiology) /area/science/xenobiology)
"aJv" = ( "aJv" = (
/turf/closed/wall, /turf/closed/wall,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aJw" = ( "aJw" = (
/obj/machinery/computer/operating, /obj/machinery/computer/operating,
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -12934,9 +12932,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aJx" = ( "aJx" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 6 dir = 6
@@ -13141,9 +13137,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aJV" = ( "aJV" = (
/obj/structure/closet/l3closet, /obj/structure/closet/l3closet,
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -13226,9 +13220,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aKg" = ( "aKg" = (
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 6 dir = 6
@@ -13307,9 +13299,7 @@
/obj/item/reagent_containers/blood/random, /obj/item/reagent_containers/blood/random,
/obj/effect/spawner/lootdrop/organ_spawner, /obj/effect/spawner/lootdrop/organ_spawner,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aKp" = ( "aKp" = (
/obj/machinery/door/window/southleft{ /obj/machinery/door/window/southleft{
name = "Genetics Pen"; name = "Genetics Pen";
@@ -13380,9 +13370,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aKx" = ( "aKx" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,
/obj/machinery/keycard_auth{ /obj/machinery/keycard_auth{
@@ -16657,9 +16645,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aUt" = ( "aUt" = (
/obj/structure/table, /obj/structure/table,
/obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular,
@@ -17785,9 +17771,7 @@
name = "privacy shutters" name = "privacy shutters"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aXq" = ( "aXq" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/folder/white, /obj/item/folder/white,
@@ -17809,9 +17793,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aXs" = ( "aXs" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/machinery/cell_charger, /obj/machinery/cell_charger,
@@ -17940,9 +17922,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aXL" = ( "aXL" = (
/obj/machinery/holopad, /obj/machinery/holopad,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -18057,9 +18037,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aXZ" = ( "aXZ" = (
/obj/machinery/door/airlock/maintenance{ /obj/machinery/door/airlock/maintenance{
name = "Surgery Maintenance Access"; name = "Surgery Maintenance Access";
@@ -18162,9 +18140,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"aYm" = ( "aYm" = (
/obj/effect/landmark/blobstart, /obj/effect/landmark/blobstart,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -20146,9 +20122,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"bdl" = ( "bdl" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
dir = 8 dir = 8
@@ -21073,9 +21047,7 @@
pixel_y = 26 pixel_y = 26
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"bft" = ( "bft" = (
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
@@ -21180,9 +21152,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"bfF" = ( "bfF" = (
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
@@ -34492,9 +34462,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"bMf" = ( "bMf" = (
/obj/structure/table/optable, /obj/structure/table/optable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -45157,9 +45125,7 @@
dir = 8 dir = 8
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"mlN" = ( "mlN" = (
/obj/structure/closet/secure_closet/freezer/cream_pie, /obj/structure/closet/secure_closet/freezer/cream_pie,
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -46117,9 +46083,7 @@
/area/quartermaster/storage) /area/quartermaster/storage)
"onl" = ( "onl" = (
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"onT" = ( "onT" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/machinery/door/window/westleft{ /obj/machinery/door/window/westleft{
@@ -50413,9 +50377,7 @@
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"xyz" = ( "xyz" = (
/obj/machinery/atmospherics/pipe/manifold/dark/visible{ /obj/machinery/atmospherics/pipe/manifold/dark/visible{
dir = 1 dir = 1

View File

@@ -56226,9 +56226,7 @@
}, },
/obj/structure/cable, /obj/structure/cable,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cts" = ( "cts" = (
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
@@ -56238,18 +56236,14 @@
dir = 1 dir = 1
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"ctt" = ( "ctt" = (
/obj/structure/cable, /obj/structure/cable,
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_y = 26 pixel_y = 26
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"ctu" = ( "ctu" = (
/obj/machinery/door/airlock/medical{ /obj/machinery/door/airlock/medical{
name = "Surgery B"; name = "Surgery B";
@@ -56257,9 +56251,7 @@
}, },
/obj/structure/cable, /obj/structure/cable,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"ctw" = ( "ctw" = (
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -56613,17 +56605,13 @@
}, },
/obj/structure/cable, /obj/structure/cable,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cul" = ( "cul" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{ /obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cum" = ( "cum" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
@@ -56634,9 +56622,7 @@
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cun" = ( "cun" = (
/obj/effect/spawner/structure/window, /obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -56647,9 +56633,7 @@
name = "privacy shutters" name = "privacy shutters"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cuo" = ( "cuo" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1 dir = 1
@@ -57099,15 +57083,11 @@
network = list("ss13","medbay") network = list("ss13","medbay")
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cvp" = ( "cvp" = (
/obj/effect/landmark/start/medical_doctor, /obj/effect/landmark/start/medical_doctor,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cvq" = ( "cvq" = (
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -57587,17 +57567,13 @@
pixel_x = -28 pixel_x = -28
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cwp" = ( "cwp" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4 dir = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cwq" = ( "cwq" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
@@ -57610,9 +57586,7 @@
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cwr" = ( "cwr" = (
/obj/effect/spawner/structure/window, /obj/effect/spawner/structure/window,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -57623,9 +57597,7 @@
name = "privacy shutters" name = "privacy shutters"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cws" = ( "cws" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -58025,9 +57997,7 @@
pixel_x = -32 pixel_x = -32
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cxf" = ( "cxf" = (
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -58035,9 +58005,7 @@
}, },
/obj/machinery/light, /obj/machinery/light,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cxg" = ( "cxg" = (
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -58049,9 +58017,7 @@
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/machinery/smartfridge/organ, /obj/machinery/smartfridge/organ,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cxh" = ( "cxh" = (
/obj/effect/spawner/structure/window, /obj/effect/spawner/structure/window,
/obj/machinery/door/poddoor/preopen{ /obj/machinery/door/poddoor/preopen{
@@ -58059,9 +58025,7 @@
name = "privacy shutters" name = "privacy shutters"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"cxi" = ( "cxi" = (
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
@@ -74978,9 +74942,7 @@
pixel_y = 4 pixel_y = 4
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"nIb" = ( "nIb" = (
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
/obj/machinery/door/airlock/mining{ /obj/machinery/door/airlock/mining{
@@ -75005,9 +74967,7 @@
/area/science/research) /area/science/research)
"nMe" = ( "nMe" = (
/turf/closed/wall, /turf/closed/wall,
/area/medical/patients_rooms/room_a{ /area/medical/surgery/room_b)
name = "Surgery B"
})
"nPC" = ( "nPC" = (
/obj/structure/cable, /obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{

View File

@@ -11,4 +11,4 @@
and most importantly, and most importantly,
how to undo your changes if you screw it up. how to undo your changes if you screw it up.
- Sayu - Sayu
*/ */

View File

@@ -10,4 +10,4 @@
#define CINEMATIC_NUKE_NO_CORE 10 #define CINEMATIC_NUKE_NO_CORE 10
#define CINEMATIC_NUKE_FAR 11 #define CINEMATIC_NUKE_FAR 11
#define CINEMATIC_NUKE_CLOWNOP 12 #define CINEMATIC_NUKE_CLOWNOP 12
#define CINEMATIC_CULT_NUKE 13 #define CINEMATIC_CULT_NUKE 13

View File

@@ -1,4 +1,4 @@
#define EXPORT_CARGO 1 #define EXPORT_CARGO 1
#define EXPORT_EMAG 2 #define EXPORT_EMAG 2
#define EXPORT_CONTRABAND 4 #define EXPORT_CONTRABAND 4
#define EXPORT_PIRATE 8 #define EXPORT_PIRATE 8

View File

@@ -1,3 +1,3 @@
#define CHECKBOX_NONE 0 #define CHECKBOX_NONE 0
#define CHECKBOX_GROUP 1 #define CHECKBOX_GROUP 1
#define CHECKBOX_TOGGLE 2 #define CHECKBOX_TOGGLE 2

View File

@@ -72,4 +72,4 @@
TECHWEB_POINT_TYPE_GENERIC = "General Research"\ TECHWEB_POINT_TYPE_GENERIC = "General Research"\
) )
#define TECHWEB_BOMB_POINTCAP 50000 //Adjust as needed; Stops toxins from nullifying RND progression mechanics. Current Value Cap Radius: 100 #define TECHWEB_BOMB_POINTCAP 50000 //Adjust as needed; Stops toxins from nullifying RND progression mechanics. Current Value Cap Radius: 100

View File

@@ -1,4 +1,4 @@
#define UI_INTERACTIVE 2 // Green/Interactive #define UI_INTERACTIVE 2 // Green/Interactive
#define UI_UPDATE 1 // Orange/Updates Only #define UI_UPDATE 1 // Orange/Updates Only
#define UI_DISABLED 0 // Red/Disabled #define UI_DISABLED 0 // Red/Disabled
#define UI_CLOSE -1 // Closed #define UI_CLOSE -1 // Closed

View File

@@ -1,2 +1,2 @@
/proc/get_policy(keyword) /proc/get_policy(keyword)
return global.config.policy[keyword] return global.config.policy[keyword]

View File

@@ -175,4 +175,4 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
offset = (y-1)*4 offset = (y-1)*4
for(x in 1 to 4) for(x in 1 to 4)
output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001) output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001)
return output return output

View File

@@ -16,4 +16,4 @@
//Opposite of format, returns as a number //Opposite of format, returns as a number
/proc/unformat_frequency(frequency) /proc/unformat_frequency(frequency)
frequency = text2num(frequency) frequency = text2num(frequency)
return frequency * 10 return frequency * 10

View File

@@ -71,4 +71,4 @@
var/list/HSL = rgb2hsl(hex2num(copytext(color,2,4)),hex2num(copytext(color,4,6)),hex2num(copytext(color,6,8))) var/list/HSL = rgb2hsl(hex2num(copytext(color,2,4)),hex2num(copytext(color,4,6)),hex2num(copytext(color,6,8)))
HSL[3] = min(HSL[3],0.4) HSL[3] = min(HSL[3],0.4)
var/list/RGB = hsl2rgb(arglist(HSL)) var/list/RGB = hsl2rgb(arglist(HSL))
return "#[num2hex(RGB[1],2)][num2hex(RGB[2],2)][num2hex(RGB[3],2)]" return "#[num2hex(RGB[1],2)][num2hex(RGB[2],2)][num2hex(RGB[3],2)]"

View File

@@ -835,4 +835,4 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
try try
return json_decode(data) return json_decode(data)
catch catch
return return

View File

@@ -9,4 +9,4 @@ GLOBAL_DATUM(start_state, /datum/station_state) // Used in round-end report
//TODO clear this one up too //TODO clear this one up too
GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult) GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult)

View File

@@ -1 +1 @@
GLOBAL_LIST_EMPTY(commendations) GLOBAL_LIST_EMPTY(commendations)

View File

@@ -34,4 +34,4 @@ function dropdowns() {
} }
} }
} }
"} "}

View File

@@ -33,4 +33,4 @@
/mob/camera/blob/AltClickOn(atom/A) //Remove a blob /mob/camera/blob/AltClickOn(atom/A) //Remove a blob
var/turf/T = get_turf(A) var/turf/T = get_turf(A)
if(T) if(T)
remove_blob(T) remove_blob(T)

View File

@@ -421,4 +421,4 @@ Example config:
//Message admins when you can. //Message admins when you can.
/datum/controller/configuration/proc/DelayedMessageAdmins(text) /datum/controller/configuration/proc/DelayedMessageAdmins(text)
addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0) addtimer(CALLBACK(GLOBAL_PROC, /proc/message_admins, text), 0)

View File

@@ -25,4 +25,4 @@
/datum/config_entry/string/medal_hub_address /datum/config_entry/string/medal_hub_address
/datum/config_entry/string/medal_hub_password /datum/config_entry/string/medal_hub_password
protection = CONFIG_ENTRY_HIDDEN protection = CONFIG_ENTRY_HIDDEN

View File

@@ -39,4 +39,4 @@
symptoms += S symptoms += S
Refresh() Refresh()
name = "Sample #[rand(1,10000)]" name = "Sample #[rand(1,10000)]"

View File

@@ -57,4 +57,4 @@ BONUS
M.adjustStaminaLoss(25) M.adjustStaminaLoss(25)
if(power >= 3 && A.stage >= 5) if(power >= 3 && A.stage >= 5)
to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>") to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
M.Stun(35) M.Stun(35)

View File

@@ -48,4 +48,4 @@ Bonus
else else
to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>") to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
M.overeatduration = max(M.overeatduration - 100, 0) M.overeatduration = max(M.overeatduration - 100, 0)
M.adjust_nutrition(-100) M.adjust_nutrition(-100)

View File

@@ -55,4 +55,4 @@ BONUS
if(5) if(5)
if(H.age > 21) if(H.age > 21)
H.age = 21 H.age = 21
to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>") to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")

View File

@@ -36,4 +36,4 @@
affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \ affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
"<span class='userdanger'>You cough up a swarm of bees!</span>") "<span class='userdanger'>You cough up a swarm of bees!</span>")
new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc) new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
return return

View File

@@ -50,4 +50,4 @@
if(!affected_mob.disease_resistances.Find(/datum/disease/flu)) if(!affected_mob.disease_resistances.Find(/datum/disease/flu))
var/datum/disease/Flu = new /datum/disease/flu() var/datum/disease/Flu = new /datum/disease/flu()
affected_mob.ForceContractDisease(Flu, FALSE, TRUE) affected_mob.ForceContractDisease(Flu, FALSE, TRUE)
cure() cure()

View File

@@ -36,4 +36,4 @@
if(prob(1)) if(prob(1))
to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>") to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
if(prob(10)) if(prob(10))
to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>") to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")

View File

@@ -65,4 +65,4 @@
var/iter = rand(1,3) var/iter = rand(1,3)
for(i=0,i<iter,i++) for(i=0,i<iter,i++)
step_towards(S,affected_mob) step_towards(S,affected_mob)
return return

View File

@@ -81,4 +81,4 @@
if(prob(50)) if(prob(50))
scramble_dna(affected_mob, 1, 0, rand(50,75)) scramble_dna(affected_mob, 1, 0, rand(50,75))
else else
scramble_dna(affected_mob, 0, 1, rand(50,75)) scramble_dna(affected_mob, 0, 1, rand(50,75))

View File

@@ -52,4 +52,4 @@
if(mend) if(mend)
A.aidisabled = FALSE A.aidisabled = FALSE
else else
A.aidisabled = TRUE A.aidisabled = TRUE

View File

@@ -45,4 +45,4 @@
if(WIRE_DISABLE) if(WIRE_DISABLE)
A.disabled = !mend A.disabled = !mend
if(WIRE_ZAP) if(WIRE_ZAP)
A.shock(usr, 50) A.shock(usr, 50)

View File

@@ -28,4 +28,4 @@
if(WIRE_MOTOR1, WIRE_MOTOR2) if(WIRE_MOTOR1, WIRE_MOTOR2)
holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The drive motor whines briefly.</span>") holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] The drive motor whines briefly.</span>")
else else
holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] You hear a radio crackle.</span>") holder.visible_message("<span class='notice'>[icon2html(M, viewers(holder))] You hear a radio crackle.</span>")

View File

@@ -679,6 +679,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "Surgery" name = "Surgery"
icon_state = "surgery" icon_state = "surgery"
/area/medical/surgery/room_b
name = "Surgery B"
icon_state = "surgery"
/area/medical/cryo /area/medical/cryo
name = "Cryogenics" name = "Cryogenics"
icon_state = "cryo" icon_state = "cryo"

View File

@@ -27,4 +27,4 @@
for(var/X in motioncameras) for(var/X in motioncameras)
var/obj/machinery/camera/cam = X var/obj/machinery/camera/cam = X
cam.lostTargetRef(WEAKREF(O)) cam.lostTargetRef(WEAKREF(O))
return return

View File

@@ -161,4 +161,4 @@
/obj/machinery/airlock_sensor/Destroy() /obj/machinery/airlock_sensor/Destroy()
SSradio.remove_object(src,frequency) SSradio.remove_object(src,frequency)
return ..() return ..()

View File

@@ -40,4 +40,4 @@
close() close()
if("minor", "clear") if("minor", "clear")
autoclose = FALSE autoclose = FALSE
open() open()

View File

@@ -22,4 +22,4 @@
icon_state = "door1" icon_state = "door1"
opacity = 1 opacity = 1
density = TRUE density = TRUE
explosion_block = 1 explosion_block = 1

View File

@@ -312,4 +312,4 @@
</div> </div>
[state_options]"} [state_options]"}
return output return output

View File

@@ -15,4 +15,4 @@
for(var/obj/item/I in equipment) for(var/obj/item/I in equipment)
if(istype(I, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/)) if(istype(I, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/))
var/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gun = I var/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/gun = I
gun.projectiles_cache = gun.projectiles_cache_max gun.projectiles_cache = gun.projectiles_cache_max

View File

@@ -207,4 +207,4 @@ the shield is disabled by means other than the action button (like running out o
/obj/durand_shield/bullet_act() /obj/durand_shield/bullet_act()
play_attack_sound() play_attack_sound()
. = ..() . = ..()

View File

@@ -71,4 +71,4 @@
/obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0) /obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
..() ..()
thrusters_action.Remove(user) thrusters_action.Remove(user)

View File

@@ -29,4 +29,4 @@
T.emp_act(EMP_LIGHT) T.emp_act(EMP_LIGHT)
else if(distance <= light_range) else if(distance <= light_range)
T.emp_act(EMP_LIGHT) T.emp_act(EMP_LIGHT)
return 1 return 1

View File

@@ -668,4 +668,4 @@
if (.) if (.)
var/obj/item/borg/apparatus/beaker/extra/E = locate() in R.module.modules var/obj/item/borg/apparatus/beaker/extra/E = locate() in R.module.modules
if (E) if (E)
R.module.remove_module(E, TRUE) R.module.remove_module(E, TRUE)

View File

@@ -10,4 +10,4 @@
new /obj/item/radio/headset/headset_srv(src) new /obj/item/radio/headset/headset_srv(src)
new /obj/item/cultivator(src) new /obj/item/cultivator(src)
new /obj/item/hatchet(src) new /obj/item/hatchet(src)
new /obj/item/storage/box/disks_plantgene(src) new /obj/item/storage/box/disks_plantgene(src)

View File

@@ -6,4 +6,4 @@
max_integrity = 250 max_integrity = 250
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80) armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
secure = TRUE secure = TRUE
damage_deflection = 20 damage_deflection = 20

View File

@@ -45,4 +45,4 @@
if(tank) if(tank)
return tank.return_analyzable_air() return tank.return_analyzable_air()
else else
return null return null

View File

@@ -8,4 +8,4 @@
var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic) var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic)
if(choice) if(choice)
Cinematic(initial(choice.id),world,null) Cinematic(initial(choice.id),world,null)

View File

@@ -32,4 +32,4 @@
else else
return return
to_chat(src, "Attempting to send [path], this may take a fair few minutes if the file is very large.") to_chat(src, "Attempting to send [path], this may take a fair few minutes if the file is very large.")
return return

View File

@@ -28,4 +28,4 @@ GLOBAL_VAR_INIT(highlander, FALSE)
addtimer(CALLBACK(src, .proc/only_one), 420) addtimer(CALLBACK(src, .proc/only_one), 420)
/mob/living/carbon/human/proc/make_scottish() /mob/living/carbon/human/proc/make_scottish()
mind.add_antag_datum(/datum/antagonist/highlander) mind.add_antag_datum(/datum/antagonist/highlander)

View File

@@ -55,4 +55,4 @@
/datum/mind/proc/leave_all_antag_huds() /datum/mind/proc/leave_all_antag_huds()
for(var/datum/atom_hud/antag/hud in GLOB.huds) for(var/datum/atom_hud/antag/hud in GLOB.huds)
if(hud.hudusers[current]) if(hud.hudusers[current])
hud.leave_hud(current) hud.leave_hud(current)

View File

@@ -1,4 +1,4 @@
/datum/antagonist/nightmare /datum/antagonist/nightmare
name = "Nightmare" name = "Nightmare"
show_in_antagpanel = FALSE show_in_antagpanel = FALSE
show_name_in_check_antagonists = TRUE show_name_in_check_antagonists = TRUE

View File

@@ -13,4 +13,4 @@ Name: IsAssemblyHolder
Desc: If true is an object that can hold an assemblyholder object Desc: If true is an object that can hold an assemblyholder object
*/ */
/obj/proc/IsAssemblyHolder() /obj/proc/IsAssemblyHolder()
return FALSE return FALSE

View File

@@ -136,4 +136,3 @@
/obj/machinery/atmospherics/pipe/layer_manifold/visible /obj/machinery/atmospherics/pipe/layer_manifold/visible
level = PIPE_VISIBLE_LEVEL level = PIPE_VISIBLE_LEVEL
layer = GAS_PIPE_VISIBLE_LAYER layer = GAS_PIPE_VISIBLE_LAYER

View File

@@ -60,4 +60,4 @@
teams never did figure out what happened that last time... and I can't wrap my head \ teams never did figure out what happened that last time... and I can't wrap my head \
around it myself. Why would a shuttle full of evacuees all snap and beat each other \ around it myself. Why would a shuttle full of evacuees all snap and beat each other \
to death the moment they reached safety?<br>\ to death the moment they reached safety?<br>\
- D. Cereza" - D. Cereza"

View File

@@ -65,4 +65,4 @@ BSQL_DEL_PROC(/datum/BSQL_Connection)
return null; return null;
. = world._BSQL_Internal_Call("QuoteString", id, "[str]") . = world._BSQL_Internal_Call("QuoteString", id, "[str]")
if(!.) if(!.)
BSQL_ERROR("Library failed to provide quote for [str]!") BSQL_ERROR("Library failed to provide quote for [str]!")

View File

@@ -453,4 +453,4 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
to_chat(src, "Custom Asay color is currently disabled by the server.") to_chat(src, "Custom Asay color is currently disabled by the server.")
return return
prefs.asaycolor = initial(prefs.asaycolor) prefs.asaycolor = initial(prefs.asaycolor)
prefs.save_preferences() prefs.save_preferences()

View File

@@ -49,4 +49,4 @@
if(T) if(T)
newAnomaly = new anomaly_path(T) newAnomaly = new anomaly_path(T)
if (newAnomaly) if (newAnomaly)
announce_to_ghosts(newAnomaly) announce_to_ghosts(newAnomaly)

View File

@@ -11,4 +11,4 @@
anomaly_path = /obj/effect/anomaly/bluespace anomaly_path = /obj/effect/anomaly/bluespace
/datum/round_event/anomaly/anomaly_bluespace/announce(fake) /datum/round_event/anomaly/anomaly_bluespace/announce(fake)
priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")

View File

@@ -11,4 +11,4 @@
anomaly_path = /obj/effect/anomaly/grav anomaly_path = /obj/effect/anomaly/grav
/datum/round_event/anomaly/anomaly_grav/announce(fake) /datum/round_event/anomaly/anomaly_grav/announce(fake)
priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") priority_announce("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert")

View File

@@ -12,4 +12,4 @@
anomaly_path = /obj/effect/anomaly/bhole anomaly_path = /obj/effect/anomaly/bhole
/datum/round_event/anomaly/anomaly_vortex/announce(fake) /datum/round_event/anomaly/anomaly_vortex/announce(fake)
priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert") priority_announce("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert")

View File

@@ -31,4 +31,4 @@
/datum/round_event/carp_migration/proc/fishannounce(atom/fish) /datum/round_event/carp_migration/proc/fishannounce(atom/fish)
if (!hasAnnounced) if (!hasAnnounced)
announce_to_ghosts(fish) //Only anounce the first fish announce_to_ghosts(fish) //Only anounce the first fish
hasAnnounced = TRUE hasAnnounced = TRUE

View File

@@ -28,4 +28,4 @@
fakeable = FALSE fakeable = FALSE
/datum/round_event/sandstorm/tick() /datum/round_event/sandstorm/tick()
spawn_meteors(10, GLOB.meteorsC) spawn_meteors(10, GLOB.meteorsC)

View File

@@ -558,4 +558,4 @@
if(4) if(4)
message = "ALL [ionthreats] ARE NOW NAMED [ionobjects]." message = "ALL [ionthreats] ARE NOW NAMED [ionobjects]."
return message return message

View File

@@ -35,4 +35,4 @@
/datum/hallucination/delusion, /datum/hallucination/delusion,
/datum/hallucination/oh_yeah) /datum/hallucination/oh_yeah)
for(var/mob/living/carbon/C in GLOB.alive_mob_list) for(var/mob/living/carbon/C in GLOB.alive_mob_list)
new picked_hallucination(C, TRUE) new picked_hallucination(C, TRUE)

View File

@@ -1,4 +1,4 @@
//this needs to come after the job_types subfolder to keep the correct ordering //this needs to come after the job_types subfolder to keep the correct ordering
#include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm" #include "..\..\..\..\_maps\map_files\PubbyStation\job_changes.dm"
#undef JOB_MODIFICATION_MAP_NAME #undef JOB_MODIFICATION_MAP_NAME

View File

@@ -15,4 +15,4 @@
if("4") if("4")
a_intent_change("harm") a_intent_change("harm")
return return
return ..() return ..()

View File

@@ -9,4 +9,4 @@
if("Q") if("Q")
uneq_active() uneq_active()
return return
return ..() return ..()

View File

@@ -24,4 +24,4 @@
if(S && S.name == "laborcamp_away") if(S && S.name == "laborcamp_away")
to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>") to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>")
return 0 return 0
..() ..()

View File

@@ -28,4 +28,4 @@
limit++ limit++
if (limit>=10) if (limit>=10)
return return
CHECK_TICK CHECK_TICK

View File

@@ -4,4 +4,4 @@
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to. if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
key = null//We null their key before deleting the mob, so they are properly kicked out. key = null//We null their key before deleting the mob, so they are properly kicked out.
qdel(src) qdel(src)
return return

View File

@@ -19,4 +19,4 @@
if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
node.queen_death() node.queen_death()
return ..() return ..()

View File

@@ -91,4 +91,4 @@
hands += mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER) hands += mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER)
overlays_standing[HANDS_LAYER] = hands overlays_standing[HANDS_LAYER] = hands
apply_overlay(HANDS_LAYER) apply_overlay(HANDS_LAYER)

View File

@@ -30,4 +30,4 @@
hud_used.alien_queen_finder.add_overlay(finder_eye) hud_used.alien_queen_finder.add_overlay(finder_eye)
/mob/living/carbon/alien/humanoid/royal/queen/findQueen() /mob/living/carbon/alien/humanoid/royal/queen/findQueen()
return //Queen already knows where she is. Hopefully. return //Queen already knows where she is. Hopefully.

View File

@@ -735,4 +735,4 @@
to_chat(H, "<span class='notice'>You connect [target]'s mind to your slime link!</span>") to_chat(H, "<span class='notice'>You connect [target]'s mind to your slime link!</span>")
else else
to_chat(H, "<span class='warning'>You can't seem to link [target]'s mind...</span>") to_chat(H, "<span class='warning'>You can't seem to link [target]'s mind...</span>")
to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>") to_chat(target, "<span class='warning'>The foreign presence leaves your mind.</span>")

View File

@@ -127,4 +127,4 @@
if(fake_species && L.health > disguise_fail_health) if(fake_species && L.health > disguise_fail_health)
switch(fake_species.type) switch(fake_species.type)
if (/datum/species/golem/bananium) if (/datum/species/golem/bananium)
speech_args[SPEECH_SPANS] |= SPAN_CLOWN speech_args[SPEECH_SPANS] |= SPAN_CLOWN

View File

@@ -74,4 +74,4 @@
/mob/living/carbon/monkey/update_hud_back(obj/item/I) /mob/living/carbon/monkey/update_hud_back(obj/item/I)
if(client && hud_used && hud_used.hud_shown) if(client && hud_used && hud_used.hud_shown)
I.screen_loc = ui_monkey_back I.screen_loc = ui_monkey_back
client.screen += I client.screen += I

View File

@@ -2,4 +2,4 @@
update_z(null) update_z(null)
..() ..()
if(!key && mind) //key and mind have become separated. if(!key && mind) //key and mind have become separated.
mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. mind.active = 0 //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body.

View File

@@ -48,4 +48,4 @@
eye.dm = Everything about the AI and the AIEye. eye.dm = Everything about the AI and the AIEye.
updating.dm = Everything about triggers that will update chunks. updating.dm = Everything about triggers that will update chunks.
*/ */

View File

@@ -995,4 +995,4 @@
forceMove(H) forceMove(H)
H.ForceContractDisease(P) H.ForceContractDisease(P)
parrot_interest = null parrot_interest = null
H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>") H.visible_message("<span class='danger'>[src] dive bombs into [H]'s chest and vanishes!</span>", "<span class='userdanger'>[src] dive bombs into your chest, vanishing! This can't be good!</span>")

View File

@@ -68,4 +68,4 @@
return return
/mob/proc/update_inv_ears() /mob/proc/update_inv_ears()
return return

View File

@@ -1,4 +1,4 @@
/area/engine/engineering/poweralert(state, source) /area/engine/engineering/poweralert(state, source)
if (state != poweralm) if (state != poweralm)
investigate_log("has a power alarm!", INVESTIGATE_SINGULO) investigate_log("has a power alarm!", INVESTIGATE_SINGULO)
..() ..()

View File

@@ -42,4 +42,4 @@
icon_state = "gaussstrong" icon_state = "gaussstrong"
damage = 25 damage = 25
speed = 0.3 speed = 0.3
range = 16 range = 16

View File

@@ -72,4 +72,4 @@
explosion(target, 0, 1, 1, 2) explosion(target, 0, 1, 1, 2)
return BULLET_ACT_HIT return BULLET_ACT_HIT
//if(istype(target, /turf/closed) || ismecha(target)) //if(istype(target, /turf/closed) || ismecha(target))
new /obj/item/broken_missile(get_turf(src), 1) new /obj/item/broken_missile(get_turf(src), 1)

View File

@@ -97,4 +97,4 @@
return techweb_point_display_generic(get_price(TN)) return techweb_point_display_generic(get_price(TN))
/datum/techweb_node/proc/on_research() //new proc, not currently in file /datum/techweb_node/proc/on_research() //new proc, not currently in file
return return

View File

@@ -63,4 +63,4 @@
y_offset = -1 y_offset = -1
see_hidden = TRUE see_hidden = TRUE
#undef SYNDICATE_CHALLENGE_TIMER #undef SYNDICATE_CHALLENGE_TIMER

View File

@@ -13,4 +13,4 @@
continue continue
explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash) explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
return return

View File

@@ -127,4 +127,4 @@
if(new_turf.density) if(new_turf.density)
break break
T = new_turf T = new_turf
perform(list(T),user = user) perform(list(T),user = user)

View File

@@ -27,4 +27,4 @@
for(var/obj/effect/proc_holder/spell/spell in linked_spells) for(var/obj/effect/proc_holder/spell/spell in linked_spells)
spell.perform(list(target),0) spell.perform(list(target),0)
return return

View File

@@ -9,4 +9,4 @@
if(dupe_type && !ispath(dupe_type)) if(dupe_type && !ispath(dupe_type))
bad_dts += t bad_dts += t
if(length(bad_dms) || length(bad_dts)) if(length(bad_dms) || length(bad_dts))
Fail("Components with invalid dupe modes: ([bad_dms.Join(",")]) ||| Components with invalid dupe types: ([bad_dts.Join(",")])") Fail("Components with invalid dupe modes: ([bad_dms.Join(",")]) ||| Components with invalid dupe types: ([bad_dts.Join(",")])")

View File

@@ -4,4 +4,4 @@
if(ss.flags & SS_NO_INIT) if(ss.flags & SS_NO_INIT)
continue continue
if(!ss.initialized) if(!ss.initialized)
Fail("[ss]([ss.type]) is a subsystem meant to initialize but doesn't get set as initialized.") Fail("[ss]([ss.type]) is a subsystem meant to initialize but doesn't get set as initialized.")

View File

@@ -1,3 +1,3 @@
/datum/unit_test/timer_sanity/Run() /datum/unit_test/timer_sanity/Run()
if(SStimer.bucket_count < 0) if(SStimer.bucket_count < 0)
Fail("SStimer is going into negative bucket count from something") Fail("SStimer is going into negative bucket count from something")

View File

@@ -14,30 +14,30 @@ if grep -P '^\ttag = \"icon' _maps/**/*.dmm; then
echo "ERROR: tag vars from icon state generation detected in maps, please remove them." echo "ERROR: tag vars from icon state generation detected in maps, please remove them."
st=1 st=1
fi; fi;
if grep 'step_[xy]' _maps/**/*.dmm; then if grep -P 'step_[xy]' _maps/**/*.dmm; then
echo "ERROR: step_x/step_y variables detected in maps, please remove them." echo "ERROR: step_x/step_y variables detected in maps, please remove them."
st=1 st=1
fi; fi;
if grep 'pixel_[xy] = 0' _maps/**/*.dmm; then if grep -P 'pixel_[xy] = 0' _maps/**/*.dmm; then
echo "WARNING: pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits." echo "WARNING: pixel_x/pixel_y = 0 variables detected in maps, please review to ensure they are not dirty varedits."
fi; fi;
if grep -P '\td[1-2] =' _maps/**/*.dmm; then if grep -P '\td[1-2] =' _maps/**/*.dmm; then
echo "ERROR: d1/d2 cable variables detected in maps, please remove them." echo "ERROR: d1/d2 cable variables detected in maps, please remove them."
st=1 st=1
fi; fi;
if grep '^/area/.+[\{]' _maps/**/*.dmm; then if grep -P '^/area/.+[\{]' _maps/**/*.dmm; then
echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths." echo "ERROR: Vareditted /area path use detected in maps, please replace with proper paths."
st=1 st=1
fi; fi;
if grep '\W\/turf\s*[,\){]' _maps/**/*.dmm; then if grep -P '\W\/turf\s*[,\){]' _maps/**/*.dmm; then
echo "ERROR: base /turf path use detected in maps, please replace with proper paths." echo "ERROR: base /turf path use detected in maps, please replace with proper paths."
st=1 st=1
fi; fi;
if grep '^/*var/' code/**/*.dm; then if grep -P '^/*var/' code/**/*.dm; then
echo "ERROR: Unmanaged global var use detected in code, please use the helpers." echo "ERROR: Unmanaged global var use detected in code, please use the helpers."
st=1 st=1
fi; fi;
if grep '(^(?!(.*\n)).*$)' code/**/*.dm; then if pcregrep --buffer-size=100K -LMr '\n$' code/**/*.dm; then
echo "ERROR: No newline at end of file detected" echo "ERROR: No newline at end of file detected"
st=1 st=1
fi; fi;