Commit Graph

2169 Commits

Author SHA1 Message Date
raspyosu 6e32a466af tweak mesmerize
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
2020-02-17 17:24:09 -05:00
Ghom 66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
kevinz000 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000 b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
2020-02-15 12:16:39 -07:00
kevinz000 f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
2020-02-15 12:16:23 -07:00
kevinz000 957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570
Something about a couple stack trace issues.
2020-02-15 11:47:30 -07:00
kevinz000 76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
2020-02-15 11:44:25 -07:00
Ghom 0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
Ghom b0d85c4aea Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18
ghosts can not force re rendering of storage to a different size
2020-02-14 19:22:05 +01:00
Ghom 64882b8a90 Merge pull request #10993 from Linzolle/bows
adds the bow
2020-02-14 08:01:12 +01:00
Linzolle 790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle 083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle 9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom 8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
Ghom 7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
Artur 8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
kevinz000 87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000 3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00
kevinz000 4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
Artur 21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Ghom 12b84aa333 Update mob_holder.dm 2020-02-12 12:43:47 +01:00
kevinz000 d8d6a8efb8 lazy-be-gone 2020-02-12 02:15:56 -07:00
kevinz000 33b3d06d4c im lazy 2020-02-12 01:44:28 -07:00
Ghommie e5ab230b26 Monky chokehold deluxe. 2020-02-12 09:32:38 +01:00
Ghommie e099ed9578 Further mob holder fixes. 2020-02-12 09:24:49 +01:00
Ghom 2ed19e0a5a Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
Ghommie 0caabe8018 Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM. 2020-02-11 15:23:03 +01:00
kevinz000 58db43621d Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
Lin 4797b5edc8 Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
2020-02-10 20:28:57 +00:00
Artur 8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
Ghommie c19549c7f9 Something about a couple stack trace issues. 2020-02-10 14:51:05 +01:00
Ghom 3ee4f25626 Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
Pandemic Fixes
2020-02-10 12:22:40 +01:00
kevinz000 c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
kevinz000 4416d9de46 Merge pull request #10965 from Citadel-Station-13/Ghommie-patch-2
Fixing the mob holder element
2020-02-10 04:11:51 -07:00
Artur 816f94bd61 pandemic fixes 2020-02-10 10:20:57 +02:00
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Ghom c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates
Updates the debug outfit
2020-02-09 22:49:22 +01:00
Ghom d991fa1252 Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing
Removes bone armor and dagger from crafting menu
2020-02-09 21:08:16 +01:00
Arturlang 29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
TrilbySpaceClone 30c78c5be2 Let their be lists 2020-02-08 02:37:37 -05:00
kevinz000 79a72fac24 fix 2020-02-07 23:32:36 -07:00
kevinz000 7c16830e91 ok 2020-02-07 23:31:38 -07:00
Ghom 82e36846bc /datum/element/cleaning cleans your face! 2020-02-08 06:18:00 +01:00
Ghom bb140df39c Fixing mob holders 2020-02-08 04:04:16 +01:00
Ghom 8365fec82e Update negative.dm 2020-02-08 00:05:23 +01:00
Seris02 4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
Ghommie 86c472eaf6 the holopad fix. 2020-02-07 03:17:00 +01:00