cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +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/research/xenobiology/xenobio_camera.dm
+30 -2
View File
@@ -267,6 +267,7 @@
var/mob/living/carbon/human/C = owner
var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = target
var/obj/machinery/monkey_recycler/recycler = X.connected_recycler
if(GLOB.cameranet.checkTurfVis(remote_eye.loc))
if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap)
@@ -279,7 +280,20 @@
to_chat(owner, "[X] doesn't have monkeys.")
return
else if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc)
var/mob/living/carbon/human/monkey/food
switch(recycler.cube_type)
if(/obj/item/food/snacks/monkeycube) // Regular monkey
food = new /mob/living/carbon/human/monkey(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/nian_wormecube) // Worme
food = new /mob/living/carbon/human/nian_worme(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/farwacube) // Farwa
food = new /mob/living/carbon/human/farwa(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/stokcube) // Stok
food = new /mob/living/carbon/human/stok(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/neaeracube) // Neara
food = new /mob/living/carbon/human/neara(remote_eye.loc)
if(/obj/item/food/snacks/monkeycube/wolpincube) // Wolpin
food = new /mob/living/carbon/human/wolpin(remote_eye.loc)
SSmobs.cubemonkeys += food
food.LAssailant = C
X.monkeys --
@@ -471,13 +485,27 @@
var/mob/living/C = user
var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin
var/obj/machinery/monkey_recycler/recycler = X.connected_recycler
var/area/turfarea = get_area(T)
if(iswallturf(T))
to_chat(user, "You can't place monkey here.")
return
else if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible)
if(X.monkeys >= 1)
var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(T)
var/mob/living/carbon/human/monkey/food
switch(recycler.cube_type)
if(/obj/item/food/snacks/monkeycube) // Regular monkey
food = new /mob/living/carbon/human/monkey(T)
if(/obj/item/food/snacks/monkeycube/nian_wormecube) // Worme
food = new /mob/living/carbon/human/nian_worme(T)
if(/obj/item/food/snacks/monkeycube/farwacube) // Farwa
food = new /mob/living/carbon/human/farwa(T)
if(/obj/item/food/snacks/monkeycube/stokcube) // Stok
food = new /mob/living/carbon/human/stok(T)
if(/obj/item/food/snacks/monkeycube/neaeracube) // Neara
food = new /mob/living/carbon/human/neara(T)
if(/obj/item/food/snacks/monkeycube/wolpincube) // Wolpin
food = new /mob/living/carbon/human/wolpin(T)
food.LAssailant = C
X.monkeys--
X.monkeys = round(X.monkeys, 0.1)