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

Nian Caterpillar Infestation and Worme Invasion (#25560)

Browse Source 
* I hate DMI merge conflicts.

* Attempt at full merge conflict resolution

* Ticked >:C

* Moves the include because

* Fixes missing proc.

* 🫃

* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.

* Adds changes requested by DGamerL

* Replaces space indents with tabs. Error caused by copy pasting.

* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Uniforms the tab spacing.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Adds requested changes from @lewcc

* Removes so missed #undef in `monkey.dm`

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Spaghetti-bit
2024-06-22 18:20:27 +00:00
committed by GitHub
co-authored by Luc DGamerL
parent 2645a94fd4
commit f0cef57c17
23 changed files with 300 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/supply/supply_packs/pack_organic.dm
+14
View File
@@ -83,6 +83,13 @@
containername = "monkey crate"
department_restrictions = list(DEPARTMENT_SERVICE, DEPARTMENT_MEDICAL, DEPARTMENT_SCIENCE)
/datum/supply_packs/organic/nian_worme
name = "Nian Worme Crate"
contains = list (/obj/item/storage/box/monkeycubes/nian_worme_cubes)
cost = 200
containername = "nian worme crate"
department_restrictions = list(DEPARTMENT_SERVICE, DEPARTMENT_MEDICAL, DEPARTMENT_SCIENCE)
/datum/supply_packs/organic/farwa
name = "Farwa Crate"
contains = list (/obj/item/storage/box/monkeycubes/farwacubes)
@@ -210,6 +217,13 @@
containertype = /obj/structure/closet/critter/butterfly
containername = "butterfly crate"
/datum/supply_packs/organic/nian_caterpillar
name = "Nian Caterpillar Crate"
cost = 150
containertype = /obj/structure/closet/critter/nian_caterpillar
contains = list(/obj/item/petcollar)
containername = "nian caterpillar crate"
/datum/supply_packs/organic/deer
name = "Deer Crate"
cost = 350 //Deer are best.