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

Adds gorillas and cargorillas (#20830)

Browse Source 
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
This commit is contained in:
S34N
2023-06-01 18:36:07 -05:00
committed by GitHub
co-authored by Henri215 Luc Nathan Winters
parent 41a250c4a3
commit bdb8039c8f
42 changed files with 487 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/keybindings/emote.dm
+7
View File
@@ -591,6 +591,13 @@
/datum/keybinding/emote/simple_animal/diona_chirp/can_use(client/C, mob/M)
return isnymph(M) && ..()
/datum/keybinding/emote/simple_animal/gorilla_ooga
linked_emote = /datum/emote/living/simple_animal/gorilla/ooga
name = "Ooga (Gorilla)"
/datum/keybinding/emote/simple_animal/gorilla_ooga/can_use(client/C, mob/M)
return isgorilla(M) && ..()
/datum/keybinding/emote/simple_animal/pet/dog/bark
linked_emote = /datum/emote/living/simple_animal/pet/dog/bark
name = "Bark (Dog)"
code/datums/keybindings/mob.dm
+6 -2
View File
@@ -25,10 +25,14 @@
/datum/keybinding/mob/drop_held_object/down(client/C)
. = ..()
var/obj/item/I = C.mob.get_active_hand()
if(!I)
I = C.mob.special_get_hands_check()
if(I)
C.mob.drop_item_v()
else
to_chat(C, "<span class='warning'>You have nothing to drop in your hand!</span>")
return
to_chat(C, "<span class='warning'>You have nothing to drop in your hand!</span>")
/datum/keybinding/mob/swap_hands
name = "Swap Hands"
code/datums/uplink_items/uplink_traitor.dm
+11
View File
@@ -259,6 +259,17 @@
cost = 8
job = list("Scientist", "Research Director", "Geneticist", "Chief Medical Officer", "Medical Doctor", "Psychiatrist", "Chemist", "Paramedic", "Coroner", "Virologist")
// Genetics
/datum/uplink_item/jobspecific/magillitis_serum
name = "Magillitis Serum Bio-chip"
desc = "A single-use bio-chip which contains an experimental serum that causes rapid muscular growth in Hominidae. \
Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
reference = "MAG"
item = /obj/item/implanter/gorilla_rampage
cost = 5
job = list("Research Director", "Geneticist")
// Paper contact poison pen
/datum/uplink_item/jobspecific/poison_pen