cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

new->init refactor

Browse Source
This commit is contained in:
Killian
2022-02-20 19:32:23 +00:00
parent 3f9af78f3a
commit 91d39da943
71 changed files with 182 additions and 4839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/alien/aliens.dm
-7
View File
@@ -14,8 +14,6 @@
icon = 'icons/mob/alien.dmi'
/*
<<<<<<< HEAD
=======
* Resin
*/
/obj/effect/alien/resin
@@ -149,7 +147,6 @@
/*
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
* Weeds
*/
#define NODERANGE 3
@@ -427,9 +424,6 @@
visible_message("<span class='alium'>[src.target] begins to crumble under the acid!</span>")
spawn(rand(150, 200)) tick()
<<<<<<< HEAD
//Xenomorph Effect egg removed, replaced with Structure Egg.
=======
/*
* Egg
*/
@@ -556,4 +550,3 @@
if(exposed_temperature > 500 + T0C)
health -= 5
healthcheck()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
code/game/objects/effects/landmarks.dm
+2 -22
View File
@@ -21,26 +21,16 @@
delete_me = 1
if("JoinLate") // Bit difference, since we need the spawn point to move.
latejoin += src
<<<<<<< HEAD
simulated = TRUE
// delete_me = 1
return
=======
simulated = 1
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
if("JoinLateGateway")
latejoin_gateway += loc
delete_me = 1
if("JoinLateElevator")
latejoin_elevator += loc
delete_me = 1
<<<<<<< HEAD
return
=======
if("JoinLateCheckpoint")
latejoin_checkpoint += loc
delete_me = 1
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
if("JoinLateCryo")
latejoin_cryo += loc
delete_me = 1
@@ -157,27 +147,17 @@
new /obj/item/clothing/head/helmet/gladiator(src.loc)
return INITIALIZE_HINT_QDEL
<<<<<<< HEAD
/obj/effect/landmark/costume/madscientist/New()
new /obj/item/clothing/under/suit_jacket/green(src.loc)
=======
/obj/effect/landmark/costume/madscientist/Initialize()
..()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
new /obj/item/clothing/under/suit_jacket/green(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/suit/storage/toggle/labcoat/mad(src.loc)
new /obj/item/clothing/glasses/gglasses(src.loc)
return INITIALIZE_HINT_QDEL
<<<<<<< HEAD
/obj/effect/landmark/costume/elpresidente/New()
new /obj/item/clothing/under/suit_jacket/green(src.loc)
=======
/obj/effect/landmark/costume/elpresidente/Initialize()
..()
new /obj/item/clothing/under/gimmick/rank/captain/suit(src.loc)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
new /obj/item/clothing/under/suit_jacket/green(src.loc)
new /obj/item/clothing/head/flatcap(src.loc)
new /obj/item/clothing/mask/smokable/cigarette/cigar/havana(src.loc)
new /obj/item/clothing/shoes/boots/jackboots(src.loc)
code/game/objects/effects/spiders.dm
-4
View File
@@ -159,7 +159,6 @@
/obj/effect/spider/spiderling/frost
grow_as = list(/mob/living/simple_mob/animal/giant_spider/frost)
<<<<<<< HEAD
/obj/effect/spider/spiderling/varied
grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/hunter,
/mob/living/simple_mob/animal/giant_spider/frost, /mob/living/simple_mob/animal/giant_spider/electric, /mob/living/simple_mob/animal/giant_spider/lurker,
@@ -167,10 +166,7 @@
/mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier,
/mob/living/simple_mob/animal/giant_spider/ion)
/obj/effect/spider/spiderling/New(var/location, var/atom/parent)
=======
/obj/effect/spider/spiderling/Initialize(var/ml, var/atom/parent)
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
pixel_x = rand(6,-6)
pixel_y = rand(6,-6)
START_PROCESSING(SSobj, src)