cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-09 07:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BOY

Browse Source
This commit is contained in:
Dip
2020-10-05 11:07:52 -03:00
parent e7fcbd07cb
commit 52eaf9ed92
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/dcs/signals.dm
View File

@@ -192,6 +192,8 @@
#define COMPONENT_NO_MOUSEDROP 1
#define COMSIG_MOUSEDROPPED_ONTO "mousedropped_onto"
#define COMSIG_MICRO_PICKUP_FEET "micro_force_grabbed" //From /datum/element/mob_holder/micro
// /area signals
///from base of area/Entered(): (atom/movable/M)

7
hyperstation/code/datums/elements/holder_micro.dm
View File

@@ -15,6 +15,13 @@
RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup_micro, override = TRUE)
RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine, override = TRUE)
RegisterSignal(target, COMSIG_MICRO_PICKUP_FEET, .proc/mob_pickup_micro_feet)
/datum/element/mob_holder/micro/Detach(datum/source, force)
. = ..()
UnregisterSignal(source, COMSIG_CLICK_ALT)
UnregisterSignal(source, COMSIG_PARENT_EXAMINE)
UnregisterSignal(source, COMSIG_MICRO_PICKUP_FEET)
/datum/element/mob_holder/micro/proc/mob_pickup_micro(mob/living/source, mob/user)
var/obj/item/clothing/head/mob_holder/micro/holder = new(get_turf(source), source, worn_state, alt_worn, right_hand, left_hand, inv_slots)

4
hyperstation/code/modules/resize/resizing.dm
View File

@@ -162,10 +162,12 @@ mob/living/get_effective_size()
else
if(istype(H) && H.dna.features["taur"] == "Naga" || H.dna.features["taur"] == "Tentacle")
tmob.visible_message("<span class='danger'>[src] snatches up [tmob] underneath their tail!</span>", "<span class='userdanger'>[src]'s tail winds around you and snatches you in its coils!</span>")
//tmob.mob_pickup_micro_feet(H) //These two procs have been disabled. Hopefully temporarily.
//tmob.mob_pickup_micro_feet(H)
SEND_SIGNAL(tmob, COMSIG_MICRO_PICKUP_FEET, H)
else
tmob.visible_message("<span class='danger'>[src] stomps down on [tmob], curling their toes and picking them up!</span>", "<span class='userdanger'>[src]'s toes pin you down and curl around you, picking you up!</span>")
//tmob.mob_pickup_micro_feet(H)
SEND_SIGNAL(tmob, COMSIG_MICRO_PICKUP_FEET, H)
return 1
if(abs(tmob.get_effective_size()/get_effective_size()) >= 2)