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

Resolves some merge conflicts

Browse Source
This commit is contained in:
Spades
2019-01-05 16:29:19 -05:00
parent 2df5e9fe0e
commit 1338225afa
9 changed files with 617 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/kitchen/smartfridge.dm
+1 -4
View File
@@ -10,11 +10,8 @@
idle_power_usage = 5
active_power_usage = 100
flags = NOREACT
<<<<<<< HEAD
var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000. //VOREStation Edit - Non-global
=======
var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
//var/global/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
var/icon_on = "smartfridge"
var/icon_off = "smartfridge-off"
var/icon_panel = "smartfridge-panel"
code/modules/xenoarcheaology/artifacts/autocloner.dm
+1 -10
View File
@@ -21,22 +21,13 @@
//33% chance to spawn nasties
if(prob(33))
<<<<<<< HEAD
spawn_type = pick(\
/mob/living/simple_animal/hostile/giant_spider/nurse,\
/mob/living/simple_animal/hostile/alien,\
/mob/living/simple_animal/hostile/bear,\
/mob/living/simple_animal/hostile/carp,\
/mob/living/simple_animal/hostile/creature\
) // Vorestation Edits
=======
spawn_type = pick(
/mob/living/simple_mob/animal/giant_spider/nurse,
/mob/living/simple_mob/animal/space/alien,
/mob/living/simple_mob/animal/space/bear,
/mob/living/simple_mob/carp,\ // Vorestation edit
/mob/living/simple_mob/creature,
/mob/living/simple_mob/slime/xenobio)
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
else
spawn_type = pick(\
/mob/living/simple_mob/animal/passive/cat,
code/modules/xenoarcheaology/artifacts/replicator.dm
+1 -6
View File
@@ -26,14 +26,9 @@
/obj/item/roller,
/obj/structure/closet/crate,
/obj/structure/closet/acloset,
<<<<<<< HEAD
/mob/living/simple_animal/hostile/mimic/crate,
/mob/living/simple_animal/hostile/viscerator,
/mob/living/simple_animal/hostile/hivebot,
=======
/mob/living/simple_mob/mimic/crate, // Vorestation edit
/mob/living/simple_mob/mechanical/viscerator,
/mob/living/simple_mob/mechanical/hivebot,
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
/obj/item/device/analyzer,
/obj/item/device/camera,
/obj/item/device/flash,
code/modules/xenoarcheaology/finds/special.dm
-4
View File
@@ -87,11 +87,7 @@
if(charges >= 3)
if(prob(5))
charges -= 1
<<<<<<< HEAD
var/spawn_type = pick(/mob/living/simple_animal/hostile/creature/vore) // Vorestation Edit
=======
var/spawn_type = pick(/mob/living/simple_mob/creature)
>>>>>>> 3155d58... Merge pull request #5735 from Neerti/hopefully_last_master_sync
new spawn_type(pick(view(1,src)))
playsound(src.loc, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3)