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

Reworking eyes of god to be risk / reward / from colossus (#20163)

Browse Source 
* eye see what is happening here

* loot it and ship it

* more progress

* more progress

* eye see

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* removing extra comment to rerun checks while I think on sprite

* name / sprite, good to go™️

* BSH no longer spawns invisible penguins

* oops wrong branch

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-01-20 19:28:22 -05:00
committed by GitHub
parent 67c6813568
commit aec7c3ff3f
16 changed files with 177 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/colossus_loot.dm
+6 -4
View File
@@ -3,10 +3,12 @@
name = "colossus chest"
/obj/structure/closet/crate/necropolis/colossus/populate_contents()
var/list/choices = subtypesof(/obj/machinery/anomalous_crystal)
var/random_crystal = pick(choices)
new random_crystal(src)
new /obj/item/organ/internal/vocal_cords/colossus(src)
var/list/crystalchoices = subtypesof(/obj/machinery/anomalous_crystal)
var/random_crystal = pick(crystalchoices)
var/list/choices = list(/obj/item/organ/internal/vocal_cords/colossus, /obj/item/organ/internal/eyes/cybernetic/eyesofgod, random_crystal)
for(var/I in 1 to 2)
var/loot = pick_n_take(choices)
new loot(src)
/obj/structure/closet/crate/necropolis/colossus/crusher
name = "angelic colossus chest"
code/modules/mining/lavaland/necropolis_chests.dm
+2 -4
View File
@@ -12,7 +12,7 @@
desc = "It's watching you suspiciously."
/obj/structure/closet/crate/necropolis/tendril/populate_contents()
var/loot = rand(1, 24)
var/loot = rand(1, 23)
switch(loot)
if(1)
new /obj/item/shared_storage/red(src)
@@ -24,7 +24,7 @@
if(4)
new /obj/item/organ/internal/cyberimp/arm/katana(src)
if(5)
new /obj/item/clothing/glasses/godeye(src)
new /obj/item/book_of_babel(src)
if(6)
new /obj/item/pickaxe/diamond(src)
if(7)
@@ -67,8 +67,6 @@
if(22)
new /obj/item/spellbook/oneuse/summonitem(src)
if(23)
new /obj/item/book_of_babel(src)
if(24)
new /obj/item/borg/upgrade/modkit/lifesteal(src)
new /obj/item/bedsheet/cult(src)