Commit Graph

6091 Commits

Author SHA1 Message Date
Trilbyspaceclone 2bfc9b8ef8 Gutlunchs now like to eat bodys a bit more! (#11545)
* Update gutlunch.dm

* hey what if we didnt just port a semi fix...
2020-03-21 15:07:32 +01:00
Ghom cf4f7a705d Update human.dm 2020-03-21 14:52:16 +01:00
ZeroMan 93b1ade0bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into uplinkclothinggetssuckies
# Conflicts:
#	code/modules/uplink/uplink_items/uplink_badass.dm
2020-03-21 02:17:13 -04:00
kevinz000 6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
Ghommie 26e2ec92ca Removes species default_features variable. 2020-03-21 02:04:57 +01:00
Trilbyspaceclone 9d0dbb38f8 Update robot_modules.dm 2020-03-20 01:52:43 -04:00
ZeroMan 35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000 8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628
More bug reports yee'd their last haw.
2020-03-19 18:56:32 -07:00
kevinz000 7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595
Yeets the preferences_vore datum and migrates its stuff to preferences.
2020-03-19 08:30:18 -07:00
Ghommie a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01:00
Ghommie 32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
kevinz000 c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
kevinz000 fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5
Positronic overlays fix.
2020-03-17 09:29:39 -07:00
kevinz000 a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
2020-03-17 09:25:51 -07:00
kevinz000 c14b1c2857 linter 2020-03-16 14:18:47 -07:00
kevinz000 9bd275e430 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-16 13:47:53 -07:00
kevinz000 0692184a0a k 2020-03-16 13:34:07 -07:00
kevinz000 b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
2020-03-16 13:23:25 -07:00
kevinz000 3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
2020-03-16 13:22:23 -07:00
kevinz000 70880624e6 implement blocktypes 2020-03-16 13:20:58 -07:00
kevinz000 ceb3d39266 k 2020-03-16 12:51:30 -07:00
kevinz000 7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000 d3724d5fbd f 2020-03-16 10:59:34 -07:00
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