Commit Graph

14466 Commits

Author SHA1 Message Date
Ghom 6f6c162138 Update living.dm 2020-03-19 15:33:19 +01:00
Ghom bd8847ab66 Update living.dm 2020-03-19 15:32:46 +01:00
Ghom e9ad37fbd0 Update belly_obj.dm 2020-03-19 15:28:41 +01:00
Seris02 ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
* yeet gone

* pfft oof

* oof
2020-03-19 13:40:11 +01:00
Ghom b03955b085 Update dueling.dm 2020-03-19 05:26:38 +01:00
Ghommie adf092996c Merge branch 'Ghommie-cit628' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit628 2020-03-19 04:50:04 +01:00
Ghommie a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01:00
Ghom 6e9aff97ae b 2020-03-19 01:44:28 +01:00
Ghommie 3aa3ed189a gunz 2020-03-18 23:53:10 +01:00
Ghommie 0285b4cee4 > virtual gf 2020-03-18 23:49:19 +01:00
Ghommie 32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
EmeraldSundisk 6855d2d9a4 Let's try this again. 2020-03-18 14:29:34 -07:00
Artur ba972cf0eb Argh 2020-03-18 22:41:21 +02:00
Hatterhat 1e10a042be arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)
* subtypes (tm)

* ok fine jeez

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-03-18 19:34:14 +01:00
kevinz000 8fbdae375c Merge pull request #11494 from Detective-Google/hudpatches
Adds craftable HUDpatches, similar to the HoS'
2020-03-18 03:35:28 -07:00
kevinz000 c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
Lin 1649f42570 bruh 2020-03-18 01:24:54 +00:00
Detective Google 6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google af872d1476 push 2020-03-17 16:10:15 -05: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 7a9525d7c7 Merge pull request #11499 from Citadel-Station-13/Ghommie-patch-3
Fixing right click / verb set_APTFT
2020-03-17 09:29:17 -07:00
kevinz000 2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626
Shortcut fix for a sticky situation.
2020-03-17 09:28:01 -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 2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix
Replaced and added missing Diagnostic HUDSunglasses sprites
2020-03-17 09:25:32 -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 2e90761f88 Merge pull request #11482 from Ghommie/Ghommie-cit624
fixing missing icon issues for some survival pod machinery.
2020-03-16 13:23:06 -07:00
kevinz000 fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
2020-03-16 13:22:49 -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 7a25e04324 bet 2020-03-16 11:15:11 -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 26ee02ef39 dab 2020-03-16 10:52:23 -07:00
kevinz000 a929fa1e8d s 2020-03-16 10:46:56 -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 a24a67e489 Update reagent_containers.dm 2020-03-16 17:07:30 +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
Ghom d47c24a8d0 Fixing right click / verb set_APTFT 2020-03-16 16:44:15 +01:00
necromanceranne 19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11:00
kevinz000 8fdb1e5964 Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
2020-03-16 06:12:40 -07: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