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

Merge pull request #12934 from farie82/Item-armor-fix

Browse Source 
Make every obj/.../New() call it's parents, Fixes things not burning on lava and causing runtimes
This commit is contained in:
Fox McCloud
2020-02-24 19:42:19 -05:00
committed by GitHub
parent 4fcedcf4bd 5ca4ea4025
commit 306fdd6629
39 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/research/experimentor.dm
View File

@@ -618,6 +618,7 @@
var/floof
/obj/item/relic/New()
..()
icon_state = pick("shock_kit","armor-igniter-analyzer","infra-igniter0","infra-igniter1","radio-multitool","prox-radio1","radio-radio","timer-multitool0","radio-igniter-tank")
realName = "[pick("broken","twisted","spun","improved","silly","regular","badly made")] [pick("device","object","toy","suspicious tech","gear")]"
floof = pick(/mob/living/simple_animal/pet/dog/corgi, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/pet/dog/fox, /mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/dog/pug, /mob/living/simple_animal/lizard, /mob/living/simple_animal/diona, /mob/living/simple_animal/butterfly, /mob/living/carbon/human/monkey)

1
code/modules/research/research.dm
View File

@@ -345,6 +345,7 @@ datum/tech/robotics
var/default_desc = "A disk for storing technology data for further research."
/obj/item/disk/tech_disk/New()
..()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)