Commit Graph
32211 Commits
Author SHA1 Message Date
Detective Google c97591cc8f h 2020-03-17 15:54:17 -05:00
EmeraldSundiskandGitHub 0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundiskandGitHub c5e315caaa Delete labour_cog.dmm 2020-03-17 11:59:20 -07:00
EmeraldSundiskandGitHub 77c7984379 Add files via upload 2020-03-17 11:51:04 -07:00
EmeraldSundiskandGitHub 4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00
kevinz000andGitHub fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5
Positronic overlays fix.
2020-03-17 09:29:39 -07:00
CitadelStationBot 7074209672 Automatic changelog generation for PR #11501 [ci skip] 2020-03-17 11:29:32 -05:00
kevinz000andGitHub 00e0683889 Merge pull request #11501 from Citadel-Station-13/Ghommie-patch-4
Ports "Makes iron sheets build the normal metal table again"
2020-03-17 09:29:29 -07:00
kevinz000andGitHub 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
CitadelStationBot a5be3a411b Automatic changelog generation for PR #11495 [ci skip] 2020-03-17 11:29:08 -05:00
kevinz000andGitHub 039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins
Ash walker camp tweak because Ghommie asked me to.
2020-03-17 09:29:05 -07:00
CitadelStationBot e5675c14da Automatic changelog generation for PR #11493 [ci skip] 2020-03-17 11:28:26 -05:00
kevinz000andGitHub 4374b09a12 Merge pull request #11493 from Trilbyspaceclone/patch-311
Blacklists two custom item flasks in "get drink" proc
2020-03-17 09:28:24 -07:00
kevinz000andGitHub 2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626
Shortcut fix for a sticky situation.
2020-03-17 09:28:01 -07:00
kevinz000andGitHub ade399dc31 Merge pull request #11486 from Citadel-Station-13/Ghommie-patch-2
Webedit fixing a runtime.
2020-03-17 09:27:36 -07:00
CitadelStationBot 0933109ed9 Automatic changelog generation for PR #11504 [ci skip] 2020-03-17 11:26:08 -05:00
kevinz000andGitHub 0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix
Fixes being unable to remove turret guns
2020-03-17 09:26:04 -07:00
CitadelStationBot 611977cc2d Automatic changelog generation for PR #11503 [ci skip] 2020-03-17 11:25:54 -05:00
kevinz000andGitHub 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
CitadelStationBot dbb35927dc Automatic changelog generation for PR #11500 [ci skip] 2020-03-17 11:25:47 -05:00
kevinz000andGitHub 8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
Electrostaff Sprite Fix
2020-03-17 09:25:44 -07:00
CitadelStationBot 254a34c809 Automatic changelog generation for PR #11498 [ci skip] 2020-03-17 11:25:35 -05:00
kevinz000andGitHub 2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix
Replaced and added missing Diagnostic HUDSunglasses sprites
2020-03-17 09:25:32 -07:00
EmeraldSundisk 01d90f5cc8 shut 2020-03-17 08:37:24 -07:00
EmeraldSundisk d8e82c03ef Update shuttles.dm 2020-03-17 08:36:28 -07:00
EmeraldSundisk dfe73565a1 Revert "shut"
This reverts commit 7502cec756.
2020-03-17 08:33:53 -07:00
EmeraldSundisk e3cbf88989 Revert "5"
This reverts commit 17877d0d75.
2020-03-17 08:33:32 -07:00
EmeraldSundisk 17877d0d75 5 2020-03-17 08:22:17 -07:00
EmeraldSundisk 7502cec756 shut 2020-03-17 08:19:45 -07:00
CitadelStationBot 2b5218085b Automatic changelog generation for PR #11484 [ci skip] 2020-03-16 15:23:49 -05:00
kevinz000andGitHub 1585b34e41 Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1
Fixing a couple issues with recyclers.
2020-03-16 13:23:46 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
2020-03-16 13:22:49 -07:00
CitadelStationBot b4338a81b0 Automatic changelog generation for PR #11483 [ci skip] 2020-03-16 15:22:26 -05:00
kevinz000andGitHub 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
ZeroMan 4e6dd9eed0 and all comes tumbling 2020-03-16 15:06:29 -04:00
ZeroMan 2e866691e1 i hate my life 2020-03-16 15:05:35 -04:00
ZeroMan 29d1eaf81d and i wanna die 2020-03-16 14:36:20 -04:00
ZeroMan cf3812d222 and i wanna die 2020-03-16 14:35:36 -04:00
necromanceranne fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11:00
CitadelStationBot 4953b5e23f Automatic changelog generation for PR #11496 [ci skip] 2020-03-16 11:20:54 -05:00
necromanceranne 6f0fc2bdea I LOVE YOU KITCHEN GUN! 2020-03-17 03:20:53 +11:00
Seris02andGitHub ffb2e65c17 why I hate byond (#11496) 2020-03-16 17:20:51 +01:00
GhomandGitHub a505806ef2 No comment. 2020-03-16 17:13:56 +01:00
GhomandGitHub a24a67e489 Update reagent_containers.dm 2020-03-16 17:07:30 +01:00
GhomandGitHub be8f5e1193 Update posibrain.dm 2020-03-16 17:05:12 +01:00
GhomandGitHub 75a84c06b1 Update MMI.dm 2020-03-16 17:04:29 +01:00
GhomandGitHub c4597bc570 Update sheet_types.dm 2020-03-16 16:59:37 +01:00
necromanceranne 5d134539ad wait no this does need another sprite goddamnit why does it work like this 2020-03-17 02:56:19 +11:00