cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes to vermin spawning, replaced rag spawners in map with actual rags

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-03 20:21:43 +10:00
parent d8782639da
commit 1c2bb7e750
3 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gameticker.dm
+6 -3
View File
@@ -328,15 +328,18 @@ var/datum/roundinfo/roundinfo = new()
turfs -= T
if(T.density)
continue
var/bad = 0
for(var/obj/I in T)
if(I.density)
continue
bad = 1
break
if(bad)
continue
if(prob(50))
//spawn a mouse, any of the gray, brown or white varieties
new /mob/living/simple_animal/mouse(T)
else
//spawn a roach
new /obj/effect/critter/roach(T)
break
spawning_vermin = 0
return 1
code/modules/DetectiveWork/footprints_and_rag.dm
-6
View File
@@ -165,12 +165,6 @@ proc/blood_incompatible(donor,receiver)
//AB is a universal receiver.
return 0
/obj/item/weapon/rag
New() // So I don't have to grab maplock
spawn(1)
new/obj/item/weapon/reagent_containers/glass/rag(loc)
del src
/obj/item/weapon/reagent_containers/glass/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."
maps/tgstation.2.0.8.dmm
+3 -3
View File
@@ -1051,7 +1051,7 @@
"auk" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor,/area/crew_quarters)
"aul" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/crayonbox,/turf/simulated/floor,/area/crew_quarters)
"aum" = (/obj/structure/table/woodentable,/turf/simulated/floor,/area/crew_quarters)
"aun" = (/obj/structure/table/woodentable,/obj/item/weapon/rag,/turf/simulated/floor,/area/crew_quarters)
"aun" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/glass/rag,/turf/simulated/floor,/area/crew_quarters)
"auo" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/window/northleft{base_state = "right"; dir = 8; icon_state = "right"},/turf/simulated/floor,/area/crew_quarters/fitness)
"aup" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/weapon/paper{desc = ""; info = "Brusies sustained in the holodeck can be healed simply by sleeping."; name = "Holodeck Procedures"},/turf/simulated/floor/plating,/area/crew_quarters/fitness)
"auq" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry)
@@ -3472,7 +3472,7 @@
"boN" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #3"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage)
"boO" = (/obj/structure/table,/obj/item/device/multitool,/turf/simulated/floor,/area/quartermaster/storage)
"boP" = (/obj/effect/landmark/start{name = "Cargo Technician"},/obj/structure/stool/bed/chair/office/dark{dir = 4},/turf/simulated/floor,/area/quartermaster/storage)
"boQ" = (/obj/machinery/door/window/eastright{name = "Reception Window"; req_access_txt = "0"},/obj/machinery/door/window/westleft{name = "Cargo Office"; req_access_txt = "31"},/obj/structure/table/reinforced,/obj/item/weapon/rag,/turf/simulated/floor,/area/quartermaster/storage)
"boQ" = (/obj/machinery/door/window/eastright{name = "Reception Window"; req_access_txt = "0"},/obj/machinery/door/window/westleft{name = "Cargo Office"; req_access_txt = "31"},/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/rag,/turf/simulated/floor,/area/quartermaster/storage)
"boR" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/window/northleft{base_state = "right"; dir = 8; icon_state = "right"},/turf/simulated/floor,/area/quartermaster)
"boS" = (/obj/machinery/camera{c_tag = "Central Primary Hallway, Teleporter Entrance"; dir = 8},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/central)
"boT" = (/turf/simulated/floor,/area/teleporter)
@@ -3718,7 +3718,7 @@
"btz" = (/obj/machinery/gibber,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/kitchen)
"btA" = (/obj/machinery/camera{c_tag = "Bar West"; dir = 4; network = "Mess Hall"},/obj/machinery/vending/boozeomat,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btB" = (/obj/effect/landmark/start{name = "Bartender"},/obj/structure/stool{pixel_y = 5},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btC" = (/obj/structure/table/reinforced,/obj/item/weapon/rag,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btC" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/glass/rag,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btD" = (/obj/structure/stool/bed/chair/comfy/black{anchored = 1},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btE" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/camera{c_tag = "Cafeteria South East"; dir = 8; network = "Mess Hall"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria)
"btF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/sortjunction{icon_state = "pipe-j2s"; sortType = list("Medbay")},/turf/simulated/floor/plating,/area/maintenance/maintcentral)