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

Removes all relative heresy (#13969)

Browse Source 
Removes all relative heresy
This commit is contained in:
AffectedArc07
2020-09-16 17:52:20 +01:00
committed by GitHub
parent 185b5c4a08
commit 90fd9a8fb8
89 changed files with 1298 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/bombspawner.dm
+9 -9
View File
@@ -6,18 +6,18 @@
var/btemp1 = 1500
var/btemp2 = 1000 // tank temperatures
timer
btype = 2
/obj/effect/spawner/newbomb/timer
btype = 2
syndicate
btemp1 = 150
btemp2 = 20
/obj/effect/spawner/newbomb/timer/syndicate
btemp1 = 150
btemp2 = 20
proximity
btype = 1
/obj/effect/spawner/newbomb/proximity
btype = 1
radio
btype = 0
/obj/effect/spawner/newbomb/radio
btype = 0
/obj/effect/spawner/newbomb/New()
code/game/objects/items/bodybag.dm
+4 -4
View File
@@ -7,10 +7,10 @@
icon_state = "bodybag_folded"
w_class = WEIGHT_CLASS_SMALL
attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
R.add_fingerprint(user)
qdel(src)
/obj/item/bodybag/attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
R.add_fingerprint(user)
qdel(src)
/obj/structure/closet/body_bag
name = "body bag"
code/game/objects/items/changestone.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/artifacts.dmi'
icon_state = "changerock"
obj/item/changestone/attack_hand(var/mob/user as mob)
/obj/item/changestone/attack_hand(var/mob/user as mob)
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(!H.gloves)
code/game/objects/items/toys.dm
+27 -27
View File
@@ -405,7 +405,7 @@
obj/item/toy/cards
/obj/item/toy/cards
resistance_flags = FLAMMABLE
max_integrity = 50
var/parentdeck = null
@@ -417,14 +417,14 @@ obj/item/toy/cards
var/card_throw_range = 20
var/list/card_attack_verb = list("attacked")
obj/item/toy/cards/New()
/obj/item/toy/cards/New()
..()
obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck
/obj/item/toy/cards/proc/apply_card_vars(obj/item/toy/cards/newobj, obj/item/toy/cards/sourceobj) // Applies variables for supporting multiple types of card deck
if(!istype(sourceobj))
return
obj/item/toy/cards/deck
/obj/item/toy/cards/deck
name = "deck of cards"
desc = "A deck of space-grade playing cards."
icon = 'icons/obj/toy.dmi'
@@ -434,7 +434,7 @@ obj/item/toy/cards/deck
var/cooldown = 0
var/list/cards = list()
obj/item/toy/cards/deck/New()
/obj/item/toy/cards/deck/New()
..()
icon_state = "deck_[deckstyle]_full"
for(var/i in 2 to 10)
@@ -459,7 +459,7 @@ obj/item/toy/cards/deck/New()
cards += "Ace of Clubs"
cards += "Ace of Diamonds"
obj/item/toy/cards/deck/attack_hand(mob/user as mob)
/obj/item/toy/cards/deck/attack_hand(mob/user as mob)
var/choice = null
if(cards.len == 0)
icon_state = "deck_[deckstyle]_empty"
@@ -477,14 +477,14 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob)
visible_message("<span class='notice'>[user] draws a card from the deck.</span>", "<span class='notice'>You draw a card from the deck.</span>")
update_icon()
obj/item/toy/cards/deck/attack_self(mob/user as mob)
/obj/item/toy/cards/deck/attack_self(mob/user as mob)
if(cooldown < world.time - 50)
cards = shuffle(cards)
playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] shuffles the deck.</span>", "<span class='notice'>You shuffle the deck.</span>")
cooldown = world.time
obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
..()
if(istype(C))
if(C.parentdeck == src)
@@ -499,7 +499,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
update_icon()
obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
/obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
..()
if(istype(C))
if(C.parentdeck == src)
@@ -513,7 +513,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
update_icon()
obj/item/toy/cards/deck/MouseDrop(atom/over_object)
/obj/item/toy/cards/deck/MouseDrop(atom/over_object)
var/mob/M = usr
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
return
@@ -537,7 +537,7 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object)
else
to_chat(usr, "<span class='notice'>You can't reach it from here.</span>")
obj/item/toy/cards/deck/update_icon()
/obj/item/toy/cards/deck/update_icon()
switch(cards.len)
if(0)
icon_state = "deck_[deckstyle]_empty"
@@ -548,7 +548,7 @@ obj/item/toy/cards/deck/update_icon()
else
icon_state = "deck_[deckstyle]_full"
obj/item/toy/cards/cardhand
/obj/item/toy/cards/cardhand
name = "hand of cards"
desc = "A number of cards not in a deck, customarily held in ones hand."
icon = 'icons/obj/toy.dmi'
@@ -558,11 +558,11 @@ obj/item/toy/cards/cardhand
var/choice = null
obj/item/toy/cards/cardhand/attack_self(mob/user as mob)
/obj/item/toy/cards/cardhand/attack_self(mob/user as mob)
user.set_machine(src)
interact(user)
obj/item/toy/cards/cardhand/interact(mob/user)
/obj/item/toy/cards/cardhand/interact(mob/user)
var/dat = "You have:<BR>"
for(var/t in currenthand)
dat += "<A href='?src=[UID()];pick=[t]'>A [t].</A><BR>"
@@ -573,7 +573,7 @@ obj/item/toy/cards/cardhand/interact(mob/user)
popup.open()
obj/item/toy/cards/cardhand/Topic(href, href_list)
/obj/item/toy/cards/cardhand/Topic(href, href_list)
if(..())
return
if(usr.stat || !ishuman(usr) || !usr.canmove)
@@ -607,7 +607,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
qdel(src)
return
obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
/obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
if(istype(C))
if(C.parentdeck == parentdeck)
currenthand += C.cardname
@@ -619,7 +619,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
else
to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj)
/obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj)
..()
newobj.deckstyle = sourceobj.deckstyle
newobj.icon_state = "[deckstyle]_hand2" // Another dumb hack, without this the hand is invisible (or has the default deckstyle) until another card is added.
@@ -632,7 +632,7 @@ obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/t
newobj.resistance_flags = sourceobj.resistance_flags
obj/item/toy/cards/singlecard
/obj/item/toy/cards/singlecard
name = "card"
desc = "a card"
icon = 'icons/obj/toy.dmi'
@@ -643,7 +643,7 @@ obj/item/toy/cards/singlecard
pixel_x = -5
obj/item/toy/cards/singlecard/examine(mob/user)
/obj/item/toy/cards/singlecard/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 0)
if(ishuman(user))
@@ -654,7 +654,7 @@ obj/item/toy/cards/singlecard/examine(mob/user)
. += "<span class='notice'>You need to have the card in your hand to check it.</span>"
obj/item/toy/cards/singlecard/verb/Flip()
/obj/item/toy/cards/singlecard/verb/Flip()
set name = "Flip Card"
set category = "Object"
set src in range(1)
@@ -675,7 +675,7 @@ obj/item/toy/cards/singlecard/verb/Flip()
name = "card"
pixel_x = -5
obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
/obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/toy/cards/singlecard/))
var/obj/item/toy/cards/singlecard/C = I
if(C.parentdeck == parentdeck)
@@ -705,7 +705,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
else
to_chat(user, "<span class='notice'>You can't mix cards from other decks.</span>")
obj/item/toy/cards/cardhand/update_icon()
/obj/item/toy/cards/cardhand/update_icon()
switch(currenthand.len)
if(0 to 1)
return
@@ -719,12 +719,12 @@ obj/item/toy/cards/cardhand/update_icon()
icon_state = "[deckstyle]_hand5"
obj/item/toy/cards/singlecard/attack_self(mob/user)
/obj/item/toy/cards/singlecard/attack_self(mob/user)
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
return
Flip()
obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj)
/obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newobj,obj/item/toy/cards/sourceobj)
..()
newobj.deckstyle = sourceobj.deckstyle
newobj.icon_state = "singlecard_down_[deckstyle]" // Without this the card is invisible until flipped. It's an ugly hack, but it works.
@@ -746,7 +746,7 @@ obj/item/toy/cards/singlecard/apply_card_vars(obj/item/toy/cards/singlecard/newo
|| Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
*/
obj/item/toy/cards/deck/syndicate
/obj/item/toy/cards/deck/syndicate
name = "suspicious looking deck of cards"
desc = "A deck of space-grade playing cards. They seem unusually rigid."
deckstyle = "syndicate"
@@ -761,10 +761,10 @@ obj/item/toy/cards/deck/syndicate
/*
|| Custom card decks ||
*/
obj/item/toy/cards/deck/black
/obj/item/toy/cards/deck/black
deckstyle = "black"
obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/cards/deck/syndicate/black
deckstyle = "black"
/obj/item/toy/nuke
code/game/objects/items/weapons/fireworks.dm
+9 -4
View File
@@ -1,10 +1,11 @@
obj/item/firework
/obj/item/firework
name = "fireworks"
icon = 'icons/obj/fireworks.dmi'
icon_state = "rocket_0"
var/litzor = 0
var/datum/effect_system/sparkle_spread/S
obj/item/firework/attackby(obj/item/W,mob/user, params)
/obj/item/firework/attackby(obj/item/W,mob/user, params)
if(litzor)
return
if(is_hot(W))
@@ -20,13 +21,13 @@ obj/item/firework/attackby(obj/item/W,mob/user, params)
S.start()
qdel(src)
obj/item/sparkler
/obj/item/sparkler
name = "sparkler"
icon = 'icons/obj/fireworks.dmi'
icon_state = "sparkler_0"
var/litzor = 0
obj/item/sparkler/attackby(obj/item/W,mob/user, params)
/obj/item/sparkler/attackby(obj/item/W,mob/user, params)
if(litzor)
return
if(is_hot(W))
@@ -39,8 +40,12 @@ obj/item/sparkler/attackby(obj/item/W,mob/user, params)
do_sparks(1, 0, loc)
sleep(10)
qdel(src)
// TODO: Refactor this into a proper locker or something
// Or just axe the system. This code is 7 years old
/obj/crate/fireworks
name = "Fireworks!"
/obj/crate/fireworks/New()
new /obj/item/sparkler(src)
new /obj/item/sparkler(src)
code/game/objects/items/weapons/grenades/spawnergrenade.dm
+17 -17
View File
@@ -9,27 +9,27 @@
var/deliveryamt = 1 // amount of type to deliver
spawner_type = /mob/living/simple_animal/hostile/viscerator
prime() // Prime now just handles the two loops that query for people in lockers and people who can see it.
/obj/item/grenade/spawnergrenade/prime() // Prime now just handles the two loops that query for people in lockers and people who can see it.
if(spawner_type && deliveryamt)
// Make a quick flash
var/turf/T = get_turf(src)
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
for(var/mob/living/carbon/C in viewers(T, null))
C.flash_eyes()
if(spawner_type && deliveryamt)
// Make a quick flash
var/turf/T = get_turf(src)
playsound(T, 'sound/effects/phasein.ogg', 100, 1)
for(var/mob/living/carbon/C in viewers(T, null))
C.flash_eyes()
for(var/i=1, i<=deliveryamt, i++)
var/atom/movable/x = new spawner_type
x.admin_spawned = admin_spawned
x.loc = T
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(x, pick(NORTH,SOUTH,EAST,WEST))
for(var/i=1, i<=deliveryamt, i++)
var/atom/movable/x = new spawner_type
x.admin_spawned = admin_spawned
x.loc = T
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(x, pick(NORTH,SOUTH,EAST,WEST))
// Spawn some hostile syndicate critters
// Spawn some hostile syndicate critters
qdel(src)
return
qdel(src)
return
/obj/item/grenade/spawnergrenade/manhacks
name = "manhack delivery grenade"
code/game/objects/items/weapons/implants/implantchair.dm
+4 -11
View File
@@ -17,13 +17,6 @@
var/mob/living/carbon/occupant = null
var/injecting = 0
/obj/machinery/implantchair/proc
go_out()
put_mob(mob/living/carbon/M)
implant(var/mob/M)
add_implants()
/obj/machinery/implantchair/New()
..()
add_implants()
@@ -87,7 +80,7 @@
return
/obj/machinery/implantchair/go_out(mob/M)
/obj/machinery/implantchair/proc/go_out(mob/M)
if(!( src.occupant ))
return
if(M == occupant) // so that the guy inside can't eject himself -Agouri
@@ -101,7 +94,7 @@
return
/obj/machinery/implantchair/put_mob(mob/living/carbon/M)
/obj/machinery/implantchair/proc/put_mob(mob/living/carbon/M)
if(!iscarbon(M))
to_chat(usr, "<span class='warning'>The [src.name] cannot hold this!</span>")
return
@@ -116,7 +109,7 @@
return 1
/obj/machinery/implantchair/implant(mob/M)
/obj/machinery/implantchair/proc/implant(mob/M)
if(!istype(M, /mob/living/carbon))
return
if(!implant_list.len) return
@@ -131,7 +124,7 @@
return
/obj/machinery/implantchair/add_implants()
/obj/machinery/implantchair/proc/add_implants()
for(var/i=0, i<src.max_implants, i++)
var/obj/item/implant/mindshield/I = new /obj/item/implant/mindshield(src)
implant_list += I
code/game/objects/items/weapons/storage/backpack.dm
+1 -1
View File
@@ -556,7 +556,7 @@
icon_state = "duffel-clown"
item_state = "duffel-clown"
obj/item/storage/backpack/duffel/blueshield
/obj/item/storage/backpack/duffel/blueshield
name = "blueshield duffelbag"
desc = "A robust duffelbag issued to Nanotrasen's finest."
icon_state = "duffel-blueshield"
code/game/objects/items/weapons/storage/boxes.dm
+303 -298
View File
@@ -66,14 +66,15 @@
/obj/item/storage/box/survival
icon_state = "box_civ"
New()
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
/obj/item/storage/box/survival/New()
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
/obj/item/storage/box/survival_vox
icon_state = "box_vox"
@@ -99,66 +100,69 @@
/obj/item/storage/box/engineer
icon_state = "box_eng"
New()
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen/engi( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
/obj/item/storage/box/engineer/New()
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
new /obj/item/tank/emergency_oxygen/engi( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
/obj/item/storage/box/survival_mining
icon_state = "box_min"
New()
..()
contents = list()
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_mining/New()
..()
contents = list()
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/tank/emergency_oxygen/engi(src)
new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
/obj/item/storage/box/survival_syndi
icon_state = "box_syndi"
New()
..()
contents = list()
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/tank/emergency_oxygen/syndi(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/reagent_containers/food/pill/initropidril(src)
new /obj/item/flashlight/flare/glowstick/red(src)
/obj/item/storage/box/survival_syndi/New()
..()
contents = list()
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/tank/emergency_oxygen/syndi(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/reagent_containers/food/pill/initropidril(src)
new /obj/item/flashlight/flare/glowstick/red(src)
/obj/item/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
icon_state = "latex"
New()
..()
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
/obj/item/storage/box/gloves/New()
..()
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/clothing/gloves/color/latex(src)
/obj/item/storage/box/masks
name = "sterile masks"
desc = "This box contains masks of sterility."
icon_state = "sterile"
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)
/obj/item/storage/box/masks/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)
/obj/item/storage/box/syringes
@@ -167,29 +171,29 @@
desc = "A biohazard alert warning is printed on the box"
icon_state = "syringe"
New()
..()
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
/obj/item/storage/box/syringes/New()
..()
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
new /obj/item/reagent_containers/syringe( src )
/obj/item/storage/box/beakers
name = "beaker box"
icon_state = "beaker"
New()
..()
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
/obj/item/storage/box/beakers/New()
..()
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
new /obj/item/reagent_containers/glass/beaker( src )
/obj/item/storage/box/beakers/bluespace
name = "box of bluespace beakers"
@@ -219,14 +223,14 @@
name = "\improper DNA injectors"
desc = "This box contains injectors it seems."
New()
..()
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/m2h(src)
new /obj/item/dnainjector/m2h(src)
new /obj/item/dnainjector/m2h(src)
/obj/item/storage/box/injectors/New()
..()
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/h2m(src)
new /obj/item/dnainjector/m2h(src)
new /obj/item/dnainjector/m2h(src)
new /obj/item/dnainjector/m2h(src)
/obj/item/storage/box/slug
name = "Ammunition Box (Slug)"
@@ -304,29 +308,29 @@
desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
icon_state = "flashbang"
New()
..()
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
/obj/item/storage/box/flashbangs/New()
..()
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
/obj/item/storage/box/flashes
name = "box of flashbulbs"
desc = "<B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
icon_state = "flashbang"
New()
..()
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
/obj/item/storage/box/flashes/New()
..()
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
new /obj/item/flash(src)
/obj/item/storage/box/teargas
name = "box of tear gas grenades (WARNING)"
@@ -348,13 +352,13 @@
desc = "A box with 5 emp grenades."
icon_state = "flashbang"
New()
..()
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
/obj/item/storage/box/emps/New()
..()
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
/obj/item/storage/box/trackimp
@@ -362,15 +366,15 @@
desc = "Box full of scum-bag tracking utensils."
icon_state = "implant"
New()
..()
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
new /obj/item/locator(src)
/obj/item/storage/box/trackimp/New()
..()
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implantcase/tracking(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
new /obj/item/locator(src)
/obj/item/storage/box/minertracker
name = "boxed tracking implant kit"
@@ -391,86 +395,86 @@
desc = "Box of stuff used to implant chemicals."
icon_state = "implant"
New()
..()
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
/obj/item/storage/box/chemimp/New()
..()
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implantcase/chem(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
/obj/item/storage/box/exileimp
name = "boxed exile implant kit"
desc = "Box of exile implants. It has a picture of a clown being booted through the Gateway."
icon_state = "implant"
New()
..()
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implanter(src)
/obj/item/storage/box/exileimp/New()
..()
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implantcase/exile(src)
new /obj/item/implanter(src)
/obj/item/storage/box/deathimp
name = "death alarm implant kit"
desc = "Box of life sign monitoring implants."
icon_state = "implant"
New()
..()
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implanter(src)
/obj/item/storage/box/deathimp/New()
..()
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implanter(src)
/obj/item/storage/box/tapes
name = "Tape Box"
desc = "A box of spare recording tapes"
icon_state = "box"
New()
..()
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
/obj/item/storage/box/tapes/New()
..()
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
new /obj/item/tape(src)
/obj/item/storage/box/rxglasses
name = "prescription glasses"
desc = "This box contains nerd glasses."
icon_state = "glasses"
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)
/obj/item/storage/box/rxglasses/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)
/obj/item/storage/box/drinkingglasses
name = "box of drinking glasses"
desc = "It has a picture of drinking glasses on it."
New()
..()
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
/obj/item/storage/box/drinkingglasses/New()
..()
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
/obj/item/storage/box/cdeathalarm_kit
name = "Death Alarm Kit"
@@ -478,43 +482,42 @@
icon_state = "implant"
item_state = "syringe_kit"
New()
..()
new /obj/item/implanter(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
/obj/item/storage/box/cdeathalarm_kit/New()
..()
new /obj/item/implanter(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
new /obj/item/implantcase/death_alarm(src)
/obj/item/storage/box/condimentbottles
name = "box of condiment bottles"
desc = "It has a large ketchup smear on it."
New()
..()
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
/obj/item/storage/box/condimentbottles/New()
..()
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
new /obj/item/reagent_containers/food/condiment(src)
/obj/item/storage/box/cups
name = "box of paper cups"
desc = "It has pictures of paper cups on the front."
New()
..()
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
/obj/item/storage/box/cups/New()
..()
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
new /obj/item/reagent_containers/food/drinks/sillycup( src )
/obj/item/storage/box/donkpockets
@@ -522,28 +525,28 @@
desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
icon_state = "donk_kit"
New()
..()
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
/obj/item/storage/box/dockpockets/New()
..()
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
/obj/item/storage/box/syndidonkpockets
name = "box of donk-pockets"
desc = "This box feels slightly warm"
icon_state = "donk_kit"
New()
..()
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
/obj/item/storage/box/syndidonkpockets/New()
..()
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
new /obj/item/reagent_containers/food/snacks/syndidonkpocket(src)
/obj/item/storage/box/monkeycubes
name = "monkey cube box"
@@ -604,59 +607,59 @@
desc = "Has so many empty IDs."
icon_state = "id"
New()
..()
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
/obj/item/storage/box/ids/New()
..()
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
new /obj/item/card/id(src)
/obj/item/storage/box/prisoner
name = "prisoner IDs"
desc = "Take away their last shred of dignity, their name."
icon_state = "id"
New()
..()
new /obj/item/card/id/prisoner/one(src)
new /obj/item/card/id/prisoner/two(src)
new /obj/item/card/id/prisoner/three(src)
new /obj/item/card/id/prisoner/four(src)
new /obj/item/card/id/prisoner/five(src)
new /obj/item/card/id/prisoner/six(src)
new /obj/item/card/id/prisoner/seven(src)
/obj/item/storage/box/prisoner/New()
..()
new /obj/item/card/id/prisoner/one(src)
new /obj/item/card/id/prisoner/two(src)
new /obj/item/card/id/prisoner/three(src)
new /obj/item/card/id/prisoner/four(src)
new /obj/item/card/id/prisoner/five(src)
new /obj/item/card/id/prisoner/six(src)
new /obj/item/card/id/prisoner/seven(src)
/obj/item/storage/box/seccarts
name = "spare R.O.B.U.S.T. Cartridges"
desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
icon_state = "pda"
New()
..()
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
/obj/item/storage/box/seccarts/New()
..()
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
/obj/item/storage/box/holobadge
name = "holobadge box"
icon_state = "box_badge"
desc = "A box claiming to contain holobadges."
New()
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
..()
return
/obj/item/storage/box/holobadge/New()
..()
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
new /obj/item/clothing/accessory/holobadge/cord(src)
/obj/item/storage/box/evidence
name = "evidence bag box"
@@ -677,50 +680,50 @@
desc = "A box full of handcuffs."
icon_state = "handcuff"
New()
..()
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
/obj/item/storage/box/handcuffs/New()
..()
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
new /obj/item/restraints/handcuffs(src)
/obj/item/storage/box/zipties
name = "box of spare zipties"
desc = "A box full of zipties."
icon_state = "handcuff"
New()
..()
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
/obj/item/storage/box/zipties/New()
..()
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
/obj/item/storage/box/alienhandcuffs
name = "box of spare handcuffs"
desc = "A box full of handcuffs."
icon_state = "alienboxCuffs"
New()
..()
for(var/i in 1 to 7)
new /obj/item/restraints/handcuffs/alien(src)
/obj/item/storage/box/alienhandcuffs/New()
..()
for(var/i in 1 to 7)
new /obj/item/restraints/handcuffs/alien(src)
/obj/item/storage/box/fakesyndiesuit
name = "boxed space suit and helmet"
desc = "A sleek, sturdy box used to hold replica spacesuits."
icon_state = "box_of_doom"
New()
..()
new /obj/item/clothing/head/syndicatefake(src)
new /obj/item/clothing/suit/syndicatefake(src)
/obj/item/storage/box/fakesyndiesuit/New()
..()
new /obj/item/clothing/head/syndicatefake(src)
new /obj/item/clothing/suit/syndicatefake(src)
/obj/item/storage/box/enforcer_rubber
name = "enforcer pistol kit (rubber)"
@@ -777,28 +780,28 @@
desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
icon_state = "mousetraps"
New()
..()
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
/obj/item/storage/box/mousetraps/New()
..()
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
new /obj/item/assembly/mousetrap( src )
/obj/item/storage/box/pillbottles
name = "box of pill bottles"
desc = "It has pictures of pill bottles on its front."
New()
..()
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
/obj/item/storage/box/pillbottles/New()
..()
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
/obj/item/storage/box/patch_packs
name = "box of patch packs"
@@ -836,10 +839,11 @@
icon_state = "spbox"
storage_slots = 8
can_hold = list(/obj/item/toy/snappop)
New()
..()
for(var/i=1; i <= storage_slots; i++)
new /obj/item/toy/snappop(src)
/obj/item/storage/box/snappops/New()
..()
for(var/i=1; i <= storage_slots; i++)
new /obj/item/toy/snappop(src)
/obj/item/storage/box/matches
name = "matchbox"
@@ -868,23 +872,24 @@
name = "box of injectors"
desc = "Contains autoinjectors."
icon_state = "syringe"
New()
..()
for(var/i; i < storage_slots; i++)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
/obj/item/storage/box/autoinjectors/New()
..()
for(var/i; i < storage_slots; i++)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
/obj/item/storage/box/autoinjector/utility
name = "autoinjector kit"
desc = "A box with several utility autoinjectors for the economical miner."
icon_state = "syringe"
New()
..()
new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
/obj/item/storage/box/autoinjector/utility/New()
..()
new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
new /obj/item/reagent_containers/hypospray/autoinjector/teporone(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
new /obj/item/reagent_containers/hypospray/autoinjector/stimpack(src)
/obj/item/storage/box/lights
name = "replacement bulbs"
code/game/objects/items/weapons/storage/storage.dm
+5 -5
View File
@@ -204,11 +204,11 @@
var/obj/item/sample_object
var/number
New(obj/item/sample as obj)
if(!istype(sample))
qdel(src)
sample_object = sample
number = 1
/datum/numbered_display/New(obj/item/sample as obj)
if(!istype(sample))
qdel(src)
sample_object = sample
number = 1
//This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing.
/obj/item/storage/proc/orient2hud(mob/user as mob)
code/game/objects/items/weapons/storage/uplink_kits.dm
+24 -24
View File
@@ -160,14 +160,14 @@
/obj/item/storage/box/syndie_kit/boolets
name = "Shotgun shells"
New()
..()
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
/obj/item/storage/box/syndie_kit/boolets/New()
..()
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
new /obj/item/ammo_casing/shotgun/fakebeanbag(src)
/obj/item/storage/box/syndie_kit/emp
name = "boxed EMP kit"
@@ -208,26 +208,26 @@
/obj/item/storage/box/syndie_kit/sarin
name = "Sarin Gas Grenades"
New()
..()
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
/obj/item/storage/box/syndie_kit/sarin/New()
..()
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
new /obj/item/grenade/chem_grenade/saringas(src)
/obj/item/storage/box/syndie_kit/bioterror
name = "bioterror syringe box"
New()
..()
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
return
/obj/item/storage/box/syndie_kit/bioterror/New()
..()
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
new /obj/item/reagent_containers/syringe/bioterror(src)
return
/obj/item/storage/box/syndie_kit/caneshotgun
name = "cane gun kit"
code/game/objects/items/weapons/tanks/tank_types.dm
+4 -4
View File
@@ -27,7 +27,7 @@
if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
obj/item/tank/oxygen/empty/New()
/obj/item/tank/oxygen/empty/New()
..()
air_contents.oxygen = null
@@ -158,7 +158,7 @@ obj/item/tank/oxygen/empty/New()
. += "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>"
playsound(user, 'sound/effects/alert.ogg', 50, 1)
obj/item/tank/emergency_oxygen/empty/New()
/obj/item/tank/emergency_oxygen/empty/New()
..()
air_contents.oxygen = null
@@ -167,7 +167,7 @@ obj/item/tank/emergency_oxygen/empty/New()
icon_state = "emergency_engi"
volume = 6
obj/item/tank/emergency_oxygen/engi/empty/New()
/obj/item/tank/emergency_oxygen/engi/empty/New()
..()
air_contents.oxygen = null
@@ -182,7 +182,7 @@ obj/item/tank/emergency_oxygen/engi/empty/New()
icon_state = "emergency_double"
volume = 10
obj/item/tank/emergency_oxygen/double/empty/New()
/obj/item/tank/emergency_oxygen/double/empty/New()
..()
air_contents.oxygen = null
code/game/objects/random/random.dm
+41 -37
View File
@@ -30,13 +30,14 @@
desc = "This is a random tool"
icon = 'icons/obj/items.dmi'
icon_state = "welder"
item_to_spawn()
return pick(/obj/item/screwdriver,\
/obj/item/wirecutters,\
/obj/item/weldingtool,\
/obj/item/crowbar,\
/obj/item/wrench,\
/obj/item/flashlight)
/obj/random/tool/item_to_spawn()
return pick(/obj/item/screwdriver,\
/obj/item/wirecutters,\
/obj/item/weldingtool,\
/obj/item/crowbar,\
/obj/item/wrench,\
/obj/item/flashlight)
/obj/random/technology_scanner
@@ -44,10 +45,11 @@
desc = "This is a random technology scanner."
icon = 'icons/obj/device.dmi'
icon_state = "atmos"
item_to_spawn()
return pick(prob(5);/obj/item/t_scanner,\
prob(2);/obj/item/radio/intercom,\
prob(5);/obj/item/analyzer)
/obj/random/technology_scanner/item_to_spawn()
return pick(prob(5);/obj/item/t_scanner,\
prob(2);/obj/item/radio/intercom,\
prob(5);/obj/item/analyzer)
/obj/random/powercell
@@ -55,23 +57,24 @@
desc = "This is a random powercell."
icon = 'icons/obj/power.dmi'
icon_state = "cell"
item_to_spawn()
return pick(prob(10);/obj/item/stock_parts/cell/crap,\
prob(40);/obj/item/stock_parts/cell,\
prob(40);/obj/item/stock_parts/cell/high,\
prob(9);/obj/item/stock_parts/cell/super,\
prob(1);/obj/item/stock_parts/cell/hyper)
/obj/random/powercell/item_to_spawn()
return pick(prob(10);/obj/item/stock_parts/cell/crap,\
prob(40);/obj/item/stock_parts/cell,\
prob(40);/obj/item/stock_parts/cell/high,\
prob(9);/obj/item/stock_parts/cell/super,\
prob(1);/obj/item/stock_parts/cell/hyper)
/obj/random/bomb_supply
name = "Bomb Supply"
desc = "This is a random bomb supply."
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "signaller"
item_to_spawn()
return pick(/obj/item/assembly/igniter,\
/obj/item/assembly/prox_sensor,\
/obj/item/assembly/signaler)
/obj/random/bomb_supply/item_to_spawn()
return pick(/obj/item/assembly/igniter,\
/obj/item/assembly/prox_sensor,\
/obj/item/assembly/signaler)
/obj/random/toolbox
@@ -79,11 +82,11 @@
desc = "This is a random toolbox."
icon = 'icons/obj/storage.dmi'
icon_state = "red"
item_to_spawn()
return pick(prob(3);/obj/item/storage/toolbox/mechanical,\
prob(2);/obj/item/storage/toolbox/electrical,\
prob(1);/obj/item/storage/toolbox/emergency)
/obj/random/toolbox/item_to_spawn()
return pick(prob(3);/obj/item/storage/toolbox/mechanical,\
prob(2);/obj/item/storage/toolbox/electrical,\
prob(1);/obj/item/storage/toolbox/emergency)
/obj/random/tech_supply
name = "Random Tech Supply"
@@ -91,15 +94,16 @@
icon = 'icons/obj/power.dmi'
icon_state = "cell"
spawn_nothing_percentage = 50
item_to_spawn()
return pick(prob(3);/obj/random/powercell,\
prob(2);/obj/random/technology_scanner,\
prob(1);/obj/item/stack/packageWrap,\
prob(2);/obj/random/bomb_supply,\
prob(1);/obj/item/extinguisher,\
prob(1);/obj/item/clothing/gloves/color/fyellow,\
prob(3);/obj/item/stack/cable_coil,\
prob(2);/obj/random/toolbox,\
prob(2);/obj/item/storage/belt/utility,\
prob(5);/obj/random/tool,\
prob(3);/obj/item/stack/tape_roll)
/obj/random/tech_supply/item_to_spawn()
return pick(prob(3);/obj/random/powercell,\
prob(2);/obj/random/technology_scanner,\
prob(1);/obj/item/stack/packageWrap,\
prob(2);/obj/random/bomb_supply,\
prob(1);/obj/item/extinguisher,\
prob(1);/obj/item/clothing/gloves/color/fyellow,\
prob(3);/obj/item/stack/cable_coil,\
prob(2);/obj/random/toolbox,\
prob(2);/obj/item/storage/belt/utility,\
prob(5);/obj/random/tool,\
prob(3);/obj/item/stack/tape_roll)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+66 -66
View File
@@ -61,89 +61,89 @@
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/hardsuit/syndi/elite/sst(src)
/obj/structure/closet/syndicate/resources/
/obj/structure/closet/syndicate/resources
desc = "An old, dusty locker."
New()
..()
var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals
var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
/obj/structure/closet/syndicate/resources/New()
..()
var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
var/rare_min = 5 //Minimum HONK of HONK in the stack HONK HONK rare minerals
var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
var/pickednum = rand(1, 50)
var/pickednum = rand(1, 50)
//Sad trombone
if(pickednum == 1)
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "IOU"
P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
//Sad trombone
if(pickednum == 1)
var/obj/item/paper/P = new /obj/item/paper(src)
P.name = "IOU"
P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
//Metal (common ore)
if(pickednum >= 2)
new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
//Metal (common ore)
if(pickednum >= 2)
new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
//Glass (common ore)
if(pickednum >= 5)
new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
//Glass (common ore)
if(pickednum >= 5)
new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
//Plasteel (common ore) Because it has a million more uses then plasma
if(pickednum >= 10)
new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
//Plasteel (common ore) Because it has a million more uses then plasma
if(pickednum >= 10)
new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
//Plasma (rare ore)
if(pickednum >= 15)
new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
//Plasma (rare ore)
if(pickednum >= 15)
new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
//Silver (rare ore)
if(pickednum >= 20)
new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
//Silver (rare ore)
if(pickednum >= 20)
new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
//Gold (rare ore)
if(pickednum >= 30)
new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
//Gold (rare ore)
if(pickednum >= 30)
new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
//Uranium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
//Uranium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
//Titanium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
//Titanium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
//Plastitanium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
//Plastitanium (rare ore)
if(pickednum >= 40)
new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
//Diamond (rare HONK)
if(pickednum >= 45)
new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
//Diamond (rare HONK)
if(pickednum >= 45)
new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
//Jetpack (You hit the jackpot!)
if(pickednum == 50)
new /obj/item/tank/jetpack/carbondioxide(src)
//Jetpack (You hit the jackpot!)
if(pickednum == 50)
new /obj/item/tank/jetpack/carbondioxide(src)
/obj/structure/closet/syndicate/resources/everything
desc = "It's an emergency storage closet for repairs."
New()
..()
var/list/resources = list(
/obj/item/stack/sheet/metal,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/mineral/gold,
/obj/item/stack/sheet/mineral/silver,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/mineral/titanium,
/obj/item/stack/sheet/mineral/plastitanium,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/rods
)
/obj/structure/closet/syndicate/resources/everything/New()
..()
var/list/resources = list(
/obj/item/stack/sheet/metal,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/mineral/gold,
/obj/item/stack/sheet/mineral/silver,
/obj/item/stack/sheet/mineral/plasma,
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/mineral/titanium,
/obj/item/stack/sheet/mineral/plastitanium,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/rods
)
for(var/i in 1 to 2)
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
for(var/i in 1 to 2)
for(var/res in resources)
var/obj/item/stack/R = new res(src)
R.amount = R.max_amount
code/game/objects/structures/crates_lockers/crates.dm
+33 -33
View File
@@ -339,24 +339,23 @@
var/target_temp = T0C - 40
var/cooling_power = 40
return_air()
var/datum/gas_mixture/gas = (..())
if(!gas) return null
var/datum/gas_mixture/newgas = new/datum/gas_mixture()
newgas.oxygen = gas.oxygen
newgas.carbon_dioxide = gas.carbon_dioxide
newgas.nitrogen = gas.nitrogen
newgas.toxins = gas.toxins
newgas.volume = gas.volume
newgas.temperature = gas.temperature
if(newgas.temperature <= target_temp) return
if((newgas.temperature - cooling_power) > target_temp)
newgas.temperature -= cooling_power
else
newgas.temperature = target_temp
return newgas
/obj/structure/closet/crate/freezer/return_air()
var/datum/gas_mixture/gas = (..())
if(!gas) return null
var/datum/gas_mixture/newgas = new/datum/gas_mixture()
newgas.oxygen = gas.oxygen
newgas.carbon_dioxide = gas.carbon_dioxide
newgas.nitrogen = gas.nitrogen
newgas.toxins = gas.toxins
newgas.volume = gas.volume
newgas.temperature = gas.temperature
if(newgas.temperature <= target_temp) return
if((newgas.temperature - cooling_power) > target_temp)
newgas.temperature -= cooling_power
else
newgas.temperature = target_temp
return newgas
/obj/structure/closet/crate/can
desc = "A large can, looks like a bin to me."
@@ -497,22 +496,23 @@
/obj/structure/closet/crate/hydroponics/prespawned
//This exists so the prespawned hydro crates spawn with their contents.
New()
..()
new /obj/item/reagent_containers/glass/bucket(src)
new /obj/item/reagent_containers/glass/bucket(src)
new /obj/item/screwdriver(src)
new /obj/item/screwdriver(src)
new /obj/item/wrench(src)
new /obj/item/wrench(src)
new /obj/item/wirecutters(src)
new /obj/item/wirecutters(src)
new /obj/item/shovel/spade(src)
new /obj/item/shovel/spade(src)
new /obj/item/storage/box/beakers(src)
new /obj/item/storage/box/beakers(src)
new /obj/item/hand_labeler(src)
new /obj/item/hand_labeler(src)
// Do I need the definition above? Who knows!
/obj/structure/closet/crate/hydroponics/prespawned/New()
..()
new /obj/item/reagent_containers/glass/bucket(src)
new /obj/item/reagent_containers/glass/bucket(src)
new /obj/item/screwdriver(src)
new /obj/item/screwdriver(src)
new /obj/item/wrench(src)
new /obj/item/wrench(src)
new /obj/item/wirecutters(src)
new /obj/item/wirecutters(src)
new /obj/item/shovel/spade(src)
new /obj/item/shovel/spade(src)
new /obj/item/storage/box/beakers(src)
new /obj/item/storage/box/beakers(src)
new /obj/item/hand_labeler(src)
new /obj/item/hand_labeler(src)
/obj/structure/closet/crate/sci
name = "science crate"
code/game/objects/structures/displaycase.dm
+1 -1
View File
@@ -144,7 +144,7 @@
to_chat(user, "<span class='notice'>You [open ? "close":"open"] [src].</span>")
toggle_lock(user)
obj/structure/displaycase/welder_act(mob/user, obj/item/I)
/obj/structure/displaycase/welder_act(mob/user, obj/item/I)
. = TRUE
if(default_welder_repair(user, I))
broken = FALSE
code/game/objects/structures/dresser.dm
+1 -1
View File
@@ -67,7 +67,7 @@
. = TRUE
default_unfasten_wrench(user, I, time = 20)
obj/structure/dresser/deconstruct(disassembled = FALSE)
/obj/structure/dresser/deconstruct(disassembled = FALSE)
var/mat_drop = 15
if(disassembled)
mat_drop = 30
code/game/objects/structures/misc.dm
+22 -25
View File
@@ -11,8 +11,8 @@
anchored = 1
density = 1
attack_hand(mob/user as mob)
to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
/obj/structure/signpost/attack_hand(mob/user as mob)
to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!")
/obj/structure/ninjatele
@@ -23,31 +23,28 @@
anchored = 1
density = 0
attack_hand(mob/user as mob)
if(user.mind.special_role=="Ninja")
switch(alert("Phase Jaunt relay primed, target locked as [station_name()], initiate VOID-shift translocation? (Warning! Internals required!)",,"Yes","No"))
if("Yes")
if(user.z != src.z) return
user.loc.loc.Exited(user)
user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1)
new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir)
to_chat(user, "<span class='boldnotice'>VOID-Shift</span> translocation successful")
if("No")
to_chat(user, "<span class='danger'>Process aborted!</span>")
/obj/structure/ninjatele/attack_hand(mob/user as mob)
if(user.mind.special_role=="Ninja")
switch(alert("Phase Jaunt relay primed, target locked as [station_name()], initiate VOID-shift translocation? (Warning! Internals required!)",,"Yes","No"))
if("Yes")
if(user.z != src.z)
return
else
to_chat(user, "<span class='danger'>FĆAL �Rr�R</span>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
user.loc.loc.Exited(user)
user.loc = pick(GLOB.carplist) // In the future, possibly make specific NinjaTele landmarks, and give him an option to teleport to North/South/East/West of SS13 instead of just hijacking a carpspawn.
playsound(user.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1)
new /obj/effect/temp_visual/dir_setting/ninja/phase(get_turf(user), user.dir)
to_chat(user, "<span class='boldnotice'>VOID-Shift</span> translocation successful")
if("No")
to_chat(user, "<span class='danger'>Process aborted!</span>")
return
else
to_chat(user, "<span class='danger'>FĆAL �Rr�R</span>: ŧer nt recgnized, c-cntr-r䣧-ç äcked.")
/obj/structure/respawner
name = "\improper Long-Distance Cloning Machine"
code/game/objects/structures/transit_tubes/transit_tube.dm
+1 -1
View File
@@ -26,7 +26,7 @@
return !density
// When destroyed by explosions, properly handle contents.
obj/structure/transit_tube/ex_act(severity)
/obj/structure/transit_tube/ex_act(severity)
switch(severity)
if(1.0)
for(var/atom/movable/AM in contents)
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -31,14 +31,14 @@
. = ..()
. += "<span class='notice'>Alt-click to rotate it clockwise.</span>"
obj/structure/windoor_assembly/New(loc, set_dir)
/obj/structure/windoor_assembly/New(loc, set_dir)
..()
if(set_dir)
dir = set_dir
ini_dir = dir
air_update_turf(1)
obj/structure/windoor_assembly/Destroy()
/obj/structure/windoor_assembly/Destroy()
density = FALSE
QDEL_NULL(electronics)
air_update_turf(1)
code/game/objects/structures/window.dm
+1 -1
View File
@@ -666,7 +666,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
icon_state = "tinted_window"
opacity = 1
obj/structure/window/full/reinforced/ice
/obj/structure/window/full/reinforced/ice
icon = 'icons/obj/smooth_structures/rice_window.dmi'
icon_state = "ice_window"
max_integrity = 150