cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the map/code issues that the body bags caused.

Browse Source 
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-03 10:28:57 +00:00
parent e8c6b08419
commit 17ed3899c4
314 changed files with 9099 additions and 9118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/storage/bible.dm
+1 -1
View File
@@ -75,7 +75,7 @@
if (istype(A, /turf/simulated/floor))
user << "\blue You hit the floor with the bible."
if(user.mind && (user.mind.assigned_role == "Chaplain"))
call(/obj/effects/rune/proc/revealrunes)(src)
call(/obj/effect/rune/proc/revealrunes)(src)
if(user.mind && (user.mind.assigned_role == "Chaplain"))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
user << "\blue You bless [A]."
code/game/objects/storage/crates.dm
+30 -30
View File
@@ -1,4 +1,4 @@
/obj/station_objects/crate
/obj/structure/crate
desc = "A crate."
name = "Crate"
icon = 'storage.dmi'
@@ -13,7 +13,7 @@
m_amt = 7500
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
/obj/station_objects/crate/internals
/obj/structure/crate/internals
desc = "A internals crate."
name = "Internals crate"
icon = 'storage.dmi'
@@ -22,7 +22,7 @@
openicon = "o2crateopen"
closedicon = "o2crate"
/obj/station_objects/crate/trashcart
/obj/structure/crate/trashcart
desc = "A heavy, metal trashcart with wheels."
name = "Trash Cart"
icon = 'storage.dmi'
@@ -31,7 +31,7 @@
openicon = "trashcartopen"
closedicon = "trashcart"
/obj/station_objects/crate/hat
/obj/structure/crate/hat
desc = "A crate filled with Valuable Collector's Hats!."
name = "Hat Crate"
icon = 'storage.dmi'
@@ -40,7 +40,7 @@
openicon = "crateopen"
closedicon = "crate"
/obj/station_objects/crate/medical
/obj/structure/crate/medical
desc = "A medical crate."
name = "Medical crate"
icon = 'storage.dmi'
@@ -49,7 +49,7 @@
openicon = "medicalcrateopen"
closedicon = "medicalcrate"
/obj/station_objects/crate/rcd
/obj/structure/crate/rcd
desc = "A crate for the storage of the RCD."
name = "RCD crate"
icon = 'storage.dmi'
@@ -58,7 +58,7 @@
openicon = "crateopen"
closedicon = "crate"
/obj/station_objects/crate/freezer
/obj/structure/crate/freezer
desc = "A freezer."
name = "Freezer"
icon = 'storage.dmi'
@@ -67,7 +67,7 @@
openicon = "freezeropen"
closedicon = "freezer"
/obj/station_objects/crate/bin
/obj/structure/crate/bin
desc = "A large bin."
name = "Large bin"
icon = 'storage.dmi'
@@ -76,7 +76,7 @@
openicon = "largebinopen"
closedicon = "largebin"
/obj/station_objects/crate/radiation
/obj/structure/crate/radiation
desc = "A crate with a radiation sign on it."
name = "Radioactive gear crate"
icon = 'storage.dmi'
@@ -87,7 +87,7 @@
/obj/item/clothing/suit/radiation
/obj/station_objects/crate/secure/weapon
/obj/structure/crate/secure/weapon
desc = "A secure weapons crate."
name = "Weapons crate"
icon = 'storage.dmi'
@@ -96,7 +96,7 @@
openicon = "weaponcrateopen"
closedicon = "weaponcrate"
/obj/station_objects/crate/secure/plasma
/obj/structure/crate/secure/plasma
desc = "A secure plasma crate."
name = "Plasma crate"
icon = 'storage.dmi'
@@ -105,7 +105,7 @@
openicon = "plasmacrateopen"
closedicon = "plasmacrate"
/obj/station_objects/crate/secure/gear
/obj/structure/crate/secure/gear
desc = "A secure gear crate."
name = "Gear crate"
icon = 'storage.dmi'
@@ -114,7 +114,7 @@
openicon = "secgearcrateopen"
closedicon = "secgearcrate"
/obj/station_objects/crate/secure/bin
/obj/structure/crate/secure/bin
desc = "A secure bin."
name = "Secure bin"
icon_state = "largebins"
@@ -125,7 +125,7 @@
sparks = "largebinsparks"
emag = "largebinemag"
/obj/station_objects/crate/secure
/obj/structure/crate/secure
desc = "A secure crate."
name = "Secure crate"
icon_state = "securecrate"
@@ -138,7 +138,7 @@
var/broken = 0
locked = 1
/obj/station_objects/crate/hydroponics
/obj/structure/crate/hydroponics
name = "Hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
icon = 'storage.dmi'
@@ -158,7 +158,7 @@
new /obj/item/weapon/pestspray(src)
new /obj/item/weapon/pestspray(src) */
/obj/station_objects/crate/hydroponics/prespawned
/obj/structure/crate/hydroponics/prespawned
//This exists so the prespawned hydro crates spawn with their contents.
/* name = "Hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
@@ -179,7 +179,7 @@
// new /obj/item/weapon/pestspray(src)
// new /obj/item/weapon/pestspray(src)
/obj/station_objects/crate/New()
/obj/structure/crate/New()
..()
spawn(1)
if(!opened) // if closed, any item at the crate's loc is put in the contents
@@ -187,7 +187,7 @@
if(I.density || I.anchored || I == src) continue
I.loc = src
/obj/station_objects/crate/secure/New()
/obj/structure/crate/secure/New()
..()
if(locked)
overlays = null
@@ -196,14 +196,14 @@
overlays = null
overlays += greenlight
/obj/station_objects/crate/rcd/New()
/obj/structure/crate/rcd/New()
..()
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd(src)
/obj/station_objects/crate/radiation/New()
/obj/structure/crate/radiation/New()
..()
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
@@ -214,7 +214,7 @@
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
/obj/station_objects/crate/proc/open()
/obj/structure/crate/proc/open()
playsound(src.loc, 'click.ogg', 15, 1, -3)
for(var/obj/O in src)
@@ -225,7 +225,7 @@
icon_state = openicon
src.opened = 1
/obj/station_objects/crate/proc/close()
/obj/structure/crate/proc/close()
playsound(src.loc, 'click.ogg', 15, 1, -3)
for(var/obj/O in get_turf(src))
if(O.density || O.anchored || O == src) continue
@@ -233,7 +233,7 @@
icon_state = closedicon
src.opened = 0
/obj/station_objects/crate/attack_hand(mob/user as mob)
/obj/structure/crate/attack_hand(mob/user as mob)
if(!locked)
if(opened) close()
else open()
@@ -241,7 +241,7 @@
user << "\red It's locked."
return
/obj/station_objects/crate/secure/attack_hand(mob/user as mob)
/obj/structure/crate/secure/attack_hand(mob/user as mob)
if(locked && allowed(user) && !broken)
user << "\blue You unlock the [src]."
src.locked = 0
@@ -249,7 +249,7 @@
overlays += greenlight
return ..()
/obj/station_objects/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/crate/secure/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/card) && src.allowed(user) && !locked && !opened && !broken)
user << "\red You lock the [src]."
src.locked = 1
@@ -269,14 +269,14 @@
return ..()
/obj/station_objects/crate/attack_paw(mob/user as mob)
/obj/structure/crate/attack_paw(mob/user as mob)
return attack_hand(user)
/obj/station_objects/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
/obj/structure/crate/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/packageWrap))
var/obj/item/weapon/packageWrap/O = W
if (O.amount > 3)
var/obj/effects/bigDelivery/P = new /obj/effects/bigDelivery(get_turf(src.loc))
var/obj/effect/bigDelivery/P = new /obj/effect/bigDelivery(get_turf(src.loc))
P.wrapped = src
src.loc = P
O.amount -= 3
@@ -288,7 +288,7 @@
W.loc = src.loc
else return attack_hand(user)
/obj/station_objects/crate/secure/emp_act(severity)
/obj/structure/crate/secure/emp_act(severity)
for(var/obj/O in src)
O.emp_act(severity)
if(!broken && !opened && prob(50/severity))
@@ -312,7 +312,7 @@
..()
/obj/station_objects/crate/ex_act(severity)
/obj/structure/crate/ex_act(severity)
switch(severity)
if(1.0)
for(var/obj/O in src.contents)
code/game/objects/storage/kit.dm
+106 -118
View File
@@ -1,200 +1,188 @@
/obj/item/weapon/storage/lglo_kit/New()
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex( src )
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/gloves/latex(src)
..()
return
/obj/item/weapon/storage/blankbox/New()
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank( src )
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
new /obj/item/ammo_casing/shotgun/blank(src)
..()
return
/obj/item/weapon/storage/flashbang_kit/New()
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang( src )
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
new /obj/item/weapon/flashbang(src)
..()
return
/obj/item/weapon/storage/emp_kit/New()
new /obj/item/weapon/empgrenade( src )
new /obj/item/weapon/empgrenade( src )
new /obj/item/weapon/empgrenade( src )
new /obj/item/weapon/empgrenade( src )
new /obj/item/weapon/empgrenade( src )
new /obj/item/weapon/empgrenade(src)
new /obj/item/weapon/empgrenade(src)
new /obj/item/weapon/empgrenade(src)
new /obj/item/weapon/empgrenade(src)
new /obj/item/weapon/empgrenade(src)
..()
return
/obj/item/weapon/storage/stma_kit/New()
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical( src )
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/mask/surgical(src)
..()
return
/obj/item/weapon/storage/gl_kit/New()
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
new /obj/item/clothing/glasses/regular( src )
..()
return
/obj/item/weapon/storage/bb_kit/New()
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/bodybag( src )
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
new /obj/item/clothing/glasses/regular(src)
..()
return
/obj/item/weapon/storage/trackimp_kit/New()
new /obj/item/weapon/implantcase/tracking( src )
new /obj/item/weapon/implantcase/tracking( src )
new /obj/item/weapon/implantcase/tracking( src )
new /obj/item/weapon/implantcase/tracking( src )
new /obj/item/weapon/implanter( src )
new /obj/item/weapon/implantpad( src )
new /obj/item/weapon/locator( src )
new /obj/item/weapon/implantcase/tracking(src)
new /obj/item/weapon/implantcase/tracking(src)
new /obj/item/weapon/implantcase/tracking(src)
new /obj/item/weapon/implantcase/tracking(src)
new /obj/item/weapon/implanter(src)
new /obj/item/weapon/implantpad(src)
new /obj/item/weapon/locator(src)
..()
return
/obj/item/weapon/storage/chemimp_kit/New()
new /obj/item/weapon/implantcase/chem( src )
new /obj/item/weapon/implantcase/chem( src )
new /obj/item/weapon/implantcase/chem( src )
new /obj/item/weapon/implantcase/chem( src )
new /obj/item/weapon/implantcase/chem( src )
new /obj/item/weapon/implanter( src )
new /obj/item/weapon/implantpad( src )
new /obj/item/weapon/implantcase/chem(src)
new /obj/item/weapon/implantcase/chem(src)
new /obj/item/weapon/implantcase/chem(src)
new /obj/item/weapon/implantcase/chem(src)
new /obj/item/weapon/implantcase/chem(src)
new /obj/item/weapon/implanter(src)
new /obj/item/weapon/implantpad(src)
..()
return
/obj/item/weapon/storage/injectbox/New()
new /obj/item/weapon/dnainjector/h2m( src )
new /obj/item/weapon/dnainjector/h2m( src )
new /obj/item/weapon/dnainjector/h2m( src )
new /obj/item/weapon/dnainjector/m2h( src )
new /obj/item/weapon/dnainjector/m2h( src )
new /obj/item/weapon/dnainjector/m2h( src )
new /obj/item/weapon/dnainjector/h2m(src)
new /obj/item/weapon/dnainjector/h2m(src)
new /obj/item/weapon/dnainjector/h2m(src)
new /obj/item/weapon/dnainjector/m2h(src)
new /obj/item/weapon/dnainjector/m2h(src)
new /obj/item/weapon/dnainjector/m2h(src)
..()
return
/obj/item/weapon/storage/fcard_kit/New()
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card( src )
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
new /obj/item/weapon/f_card(src)
..()
return
/obj/item/weapon/storage/id_kit/New()
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id( src )
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
new /obj/item/weapon/card/id(src)
..()
return
/obj/item/weapon/storage/handcuff_kit/New()
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs( src )
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
new /obj/item/weapon/handcuffs(src)
..()
return
/obj/item/weapon/storage/donkpocket_kit/New()
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket( src )
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
..()
return
/obj/item/weapon/storage/condimentbottles/New()
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment( src )
new /obj/item/weapon/reagent_containers/food/condiment(src)
new /obj/item/weapon/reagent_containers/food/condiment(src)
new /obj/item/weapon/reagent_containers/food/condiment(src)
new /obj/item/weapon/reagent_containers/food/condiment(src)
new /obj/item/weapon/reagent_containers/food/condiment(src)
new /obj/item/weapon/reagent_containers/food/condiment(src)
..()
return
/obj/item/weapon/storage/drinkingglasses/New()
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( src )
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
..()
return
/*
/obj/item/weapon/storage/disk_kit/disks/New()
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data( src )
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
new /obj/item/weapon/card/data(src)
..()
return
code/game/objects/storage/lockbox.dm
+1 -1
View File
@@ -39,7 +39,7 @@
desc = "It appears to be broken."
icon_state = src.icon_broken
if(istype(W, /obj/item/weapon/melee/energy/blade))
var/datum/effects/system/spark_spread/spark_system = new /datum/effects/system/spark_spread()
var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
spark_system.start()
playsound(src.loc, 'blade1.ogg', 50, 1)
code/game/objects/storage/storage.dm
+2 -2
View File
@@ -257,8 +257,8 @@
return
if ("screwed")
new /obj/effects/spawner/newbomb/timer/syndicate(src)
new /obj/effects/spawner/newbomb/timer/syndicate(src)
new /obj/effect/spawner/newbomb/timer/syndicate(src)
new /obj/effect/spawner/newbomb/timer/syndicate(src)
new /obj/item/device/powersink(src)
new /obj/item/clothing/suit/space/syndicate(src)
new /obj/item/clothing/head/helmet/space/syndicate(src)