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

/obj/item/storage no longer uses /New (#18306)

Browse Source
This commit is contained in:
moxian
2022-07-12 20:38:06 +00:00
committed by GitHub
parent 694ba4be7d
commit f0768024d2
20 changed files with 58 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/contraband.dm
+6 -18
View File
@@ -6,30 +6,18 @@
desc = "Highly illegal drug. When you want to see the rainbow."
wrapper_color = COLOR_PINK
/obj/item/storage/pill_bottle/happy/New()
..()
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
new /obj/item/reagent_containers/food/pill/happy( src )
/obj/item/storage/pill_bottle/happy/populate_contents()
for(var/i in 1 to 7)
new /obj/item/reagent_containers/food/pill/happy(src)
/obj/item/storage/pill_bottle/zoom
name = "Zoom pills"
desc = "Highly illegal drug. Trade brain for speed."
wrapper_color = COLOR_BLUE
/obj/item/storage/pill_bottle/zoom/New()
..()
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
new /obj/item/reagent_containers/food/pill/zoom( src )
/obj/item/storage/pill_bottle/zoom/populate_contents()
for(var/i in 1 to 7)
new /obj/item/reagent_containers/food/pill/zoom(src)
/obj/item/reagent_containers/food/pill/random_drugs
name = "pill"
code/game/objects/items/devices/traitordevices.dm
+1 -3
View File
@@ -311,11 +311,9 @@
/obj/item/storage/box/syndie_kit/teleporter
name = "syndicate teleporter kit"
/obj/item/storage/box/syndie_kit/teleporter/New()
..()
/obj/item/storage/box/syndie_kit/teleporter/populate_contents()
new /obj/item/teleporter(src)
new /obj/item/paper/teleporter(src)
return
/obj/effect/temp_visual/teleport_abductor/syndi_teleporter
duration = 5
code/game/objects/items/random_items.dm
+28 -16
View File
@@ -126,16 +126,22 @@
allow_wrap = FALSE
var/labelled = FALSE
/obj/item/storage/pill_bottle/random_meds/New()
..()
/obj/item/storage/pill_bottle/random_meds/Initialize(mapload)
. = ..()
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
/obj/item/storage/pill_bottle/random_meds/populate_contents()
var/list/possible_meds_standard = GLOB.standard_medicines.Copy()
var/list/possible_meds_rare = GLOB.rare_medicines.Copy()
for(var/i in 1 to storage_slots)
var/list/possible_medicines = GLOB.standard_medicines.Copy()
if(prob(50))
possible_medicines += GLOB.rare_medicines.Copy()
var/datum/reagent/R = pick(possible_medicines)
var/is_rare = prob(33)
var/possible_meds = is_rare ? possible_meds_rare : possible_meds_standard
var/datum/reagent/R = pick(possible_meds)
var/obj/item/reagent_containers/food/pill/P = new(src)
if(GLOB.rare_medicines.Find(R))
if(is_rare)
P.reagents.add_reagent(R, 10)
else
P.reagents.add_reagent(R, rand(2, 5)*10)
@@ -145,8 +151,7 @@
else
P.name = "Unlabelled Pill"
P.desc = "Something about this pill entices you to try it, against your better judgement."
pixel_x = rand(-10, 10)
pixel_y = rand(-10, 10)
/obj/item/storage/pill_bottle/random_meds/labelled
name = "variety pillbottle"
@@ -268,14 +273,21 @@
name = "tactical grenades"
desc = "A box with 6 tactical grenades."
icon_state = "flashbang"
var/list/grenadelist = list(/obj/item/grenade/chem_grenade/metalfoam, /obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/antiweed, /obj/item/grenade/chem_grenade/cleaner, /obj/item/grenade/chem_grenade/teargas,
/obj/item/grenade/chem_grenade/holywater, /obj/item/grenade/chem_grenade/meat,
/obj/item/grenade/chem_grenade/dirt, /obj/item/grenade/chem_grenade/lube, /obj/item/grenade/smokebomb,
/obj/item/grenade/chem_grenade/drugs, /obj/item/grenade/chem_grenade/ethanol) // holy list batman
/obj/item/storage/box/grenades/New()
..()
/obj/item/storage/box/grenades/populate_contents()
var/static/list/grenadelist = list(
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/incendiary,
/obj/item/grenade/chem_grenade/antiweed,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/teargas,
/obj/item/grenade/chem_grenade/holywater,
/obj/item/grenade/chem_grenade/meat,
/obj/item/grenade/chem_grenade/dirt,
/obj/item/grenade/chem_grenade/lube,
/obj/item/grenade/smokebomb,
/obj/item/grenade/chem_grenade/drugs,
/obj/item/grenade/chem_grenade/ethanol) // holy list batman
for(var/i in 1 to 6)
var/nade = pick(grenadelist)
new nade(src)
code/game/objects/items/toys.dm
+1 -2
View File
@@ -924,8 +924,7 @@
name = "Box of Miniatures"
desc = "The nerd's best friends."
icon_state = "box"
/obj/item/storage/box/characters/New()
..()
/obj/item/storage/box/characters/populate_contents()
new /obj/item/toy/character/alien(src)
new /obj/item/toy/character/cleric(src)
new /obj/item/toy/character/warrior(src)
code/game/objects/items/weapons/dice.dm
+2 -4
View File
@@ -6,8 +6,7 @@
can_hold = list(/obj/item/dice)
allow_wrap = FALSE
/obj/item/storage/pill_bottle/dice/New()
..()
/obj/item/storage/pill_bottle/dice/populate_contents()
var/special_die = pick("1","2","fudge","00","100")
if(special_die == "1")
new /obj/item/dice/d1(src)
@@ -385,8 +384,7 @@
desc = "ANOTHER ONE!? FUCK!"
icon_state = "box"
/obj/item/storage/box/dice/New()
..()
/obj/item/storage/box/dice/populate_contents()
new /obj/item/dice/d2(src)
new /obj/item/dice/d4(src)
new /obj/item/dice/d8(src)
code/game/objects/items/weapons/grenades/custom_grenades.dm
+3 -9
View File
@@ -277,29 +277,23 @@
/obj/item/storage/box/syndie_kit/remotegrenade
name = "remote grenade kit"
/obj/item/storage/box/syndie_kit/remotegrenade/New()
..()
/obj/item/storage/box/syndie_kit/remotegrenade/populate_contents()
new /obj/item/grenade/chem_grenade/explosion/remote(src)
new /obj/item/multitool(src) // used to adjust the chemgrenade's signaller
new /obj/item/assembly/signaler(src)
return
/obj/item/storage/box/syndie_kit/remoteemp
name = "remote EMP kit"
/obj/item/storage/box/syndie_kit/remoteemp/New()
..()
/obj/item/storage/box/syndie_kit/remoteemp/populate_contents()
new /obj/item/grenade/chem_grenade/emp/remote(src)
new /obj/item/multitool(src) // used to adjust the chemgrenade's signaller
new /obj/item/assembly/signaler(src)
return
/obj/item/storage/box/syndie_kit/remotelube
name = "remote lube kit"
/obj/item/storage/box/syndie_kit/remotelube/New()
..()
/obj/item/storage/box/syndie_kit/remotelube/populate_contents()
new /obj/item/grenade/chem_grenade/lube(src)
new /obj/item/multitool(src) // used to adjust the chemgrenade's signaller
new /obj/item/assembly/signaler(src)
return