shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made the changeling tentacle disarm a bit more reliable.

Browse Source
This commit is contained in:
Useroth
2019-06-03 22:56:01 +02:00
parent 6e6a1f4615
commit ebb820ed38
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/powers/mutations.dm
+2 -3
View File
@@ -344,9 +344,8 @@
if(isitem(target))
var/obj/item/I = target
if(!I.anchored)
to_chat(firer, "<span class='notice'>You pull [I] towards yourself.</span>")
H.throw_mode_on()
I.throw_at(H, 10, 2)
to_chat(firer, "<span class='notice'>You pull [I] right into your grasp.</span>")
H.put_in_hands(I) //Because throwing it is goofy as fuck and unreliable. If you land the tentacle despite the penalties to accuracy, you should have your reward.
. = 1
else if(isliving(target))
tgstation.dme
+12 -12
View File
@@ -2505,22 +2505,10 @@
#include "code\modules\research\designs\AI_module_designs.dm"
#include "code\modules\research\designs\biogenerator_designs.dm"
#include "code\modules\research\designs\bluespace_designs.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm"
#include "code\modules\research\designs\computer_part_designs.dm"
#include "code\modules\research\designs\electronics_designs.dm"
#include "code\modules\research\designs\equipment_designs.dm"
#include "code\modules\research\designs\limbgrower_designs.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_service.dm"
#include "code\modules\research\designs\mecha_designs.dm"
#include "code\modules\research\designs\mechfabricator_designs.dm"
#include "code\modules\research\designs\medical_designs.dm"
@@ -2538,6 +2526,18 @@
#include "code\modules\research\designs\autolathe_desings\autolathe_designs_sec_and_hacked.dm"
#include "code\modules\research\designs\autolathe_desings\autolathe_designs_tcomms_and_misc.dm"
#include "code\modules\research\designs\autolathe_desings\autolathe_designs_tools.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm"
#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm"
#include "code\modules\research\designs\machine_desings\machine_designs_service.dm"
#include "code\modules\research\machinery\_production.dm"
#include "code\modules\research\machinery\circuit_imprinter.dm"
#include "code\modules\research\machinery\departmental_circuit_imprinter.dm"