Commit Graph

5968 Commits

Author SHA1 Message Date
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07:00
necromanceranne
6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Seris02
ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
Ghom
a505806ef2 No comment. 2020-03-16 17:13:56 +01:00
Ghom
be8f5e1193 Update posibrain.dm 2020-03-16 17:05:12 +01:00
Ghom
75a84c06b1 Update MMI.dm 2020-03-16 17:04:29 +01:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
2a9e4bebdd priority 2020-03-16 04:24:18 -07:00
kevinz000
69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000
857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000
644273beca k 2020-03-16 04:09:25 -07:00
kevinz000
94db06509c slight desword reflect meme buff 2020-03-16 03:50:26 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
9ead492bb0 changes 2020-03-16 00:28:18 -07:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
Ghommie
5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie
8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Ghommie
ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00
Ghommie
5bfbcd0948 Fixing some GetElement runtimes. 2020-03-15 15:12:35 +01:00
kevinz000
b7c3ada3e5 nuclear fixes the blindness issue by making eye_blind() max() rather than add (#11438)
* Update status_procs.dm

* Update status_procs.dm

* travis

* aight bet
2020-03-15 13:08:52 +01:00
kevinz000
2de1395e6b Merge pull request #11471 from Citadel-Station-13/Ghommie-patch-1
Webedit fixing electrocute_act stuns.
2020-03-14 21:49:36 -07:00
kevinz000
4d0677daa9 s 2020-03-14 21:48:23 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
kevinz000
1a061a5d3e agony 2020-03-14 21:14:56 -07:00
Kraseo
bee11a2ee5 no i am not testing if mice can chew wires if they're in a stomach now shut the fuck up (#11460) 2020-03-15 04:04:35 +01:00
Ghom
06d641b46a Webedit fixing electrocute_act stuns. 2020-03-14 21:19:09 +01:00
kevinz000
0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke
I'm pretty sure this was causing people to bleed out from light hits
2020-03-14 09:11:38 -07:00
kevinz000
395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
necromanceranne
49c0aba205 bleeding out from a toolbox smack is not cool gamers 2020-03-14 04:25:12 +11:00
Ghommie
da5b293033 underscores. 2020-03-12 21:31:17 +01:00
Ghommie
663a849afe Makes the autotransfer subsystem a bit more optional. 2020-03-12 21:02:34 +01:00
Ghommie
8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:31:14 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
kevinz000
54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
kevinz000
3df171cf99 Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1
Fixes mob spawners errors with posibrains.
2020-03-11 17:00:46 -07:00
Ghom
3b102c4ef7 Merge pull request #11432 from Citadel-Station-13/kevinz000-patch-2
legion swarming now only applies to legions, not all of everything else that is a supertype and subtype of /hivelordbrood
2020-03-11 17:21:00 +01:00
Ghom
ed92d21a0e Merge pull request #11427 from Citadel-Station-13/kevinz000-patch-5
Fixes posibrain/MMI mechs not getting any mobility flags
2020-03-11 16:48:02 +01:00
Ghommie
d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
kevinz000
2bf892c482 Update bubblegum.dm 2020-03-11 08:07:37 -07:00
kevinz000
bfeb2f0952 Update hivelord.dm 2020-03-11 08:07:20 -07:00
kevinz000
2552a34c21 Update hivelord.dm 2020-03-11 08:02:33 -07:00
kevinz000
ee68e71b2a Update bubblegum.dm 2020-03-11 08:01:34 -07:00
kevinz000
dbcb9fec6a Update code/modules/mob/living/brain/brain.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-11 07:56:26 -07:00
Ghom
f7674067d2 Merge pull request #11421 from Citadel-Station-13/kevinz000-patch-2
Fixes the "blind while not unconscious bug", alternatively, "if in doubt, assume something is coded in the worst possible way and is held together by duct tape and prayers"
2020-03-11 13:17:47 +01:00