Commit Graph

20771 Commits

Author SHA1 Message Date
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
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
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
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
kevinz000
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
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
ade399dc31 Merge pull request #11486 from Citadel-Station-13/Ghommie-patch-2
Webedit fixing a runtime.
2020-03-17 09:27:36 -07:00
kevinz000
0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix
Fixes being unable to remove turret guns
2020-03-17 09:26:04 -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
8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
Electrostaff Sprite Fix
2020-03-17 09:25:44 -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
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
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
necromanceranne
fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11: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
c4597bc570 Update sheet_types.dm 2020-03-16 16:59:37 +01:00
necromanceranne
5eb93eaa56 And these too 2020-03-17 02:49:27 +11:00
Ghom
d47c24a8d0 Fixing right click / verb set_APTFT 2020-03-16 16:44:15 +01:00
necromanceranne
b5872bba63 Pretty sure this should now use the correct sprites 2020-03-17 02:43:44 +11: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
Seris02
b8e8a81d1c there 2020-03-16 20:49:10 +08:00
Detective Google
828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
BlackMajor
97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
Detective Google
815844accd corrects sechud requirement. 2020-03-16 01:48:29 -05:00
Detective Google
94f694e568 adds some hudpatches
seemed like fun flavor, inspired by bay and a request.
2020-03-16 01:44:26 -05:00
Trilbyspaceclone
ff035f2775 Update unsorted.dm 2020-03-16 02:38:25 -04:00
Hatterhat
1fe67d5ce9 a finger of the monkey's paw curls. 2020-03-16 01:35:47 -05:00
kevinz000
fae84f9ee6 Merge pull request #11462 from Ghommie/Ghommie-cit621
Fixing some bug reports.
2020-03-15 23:03:59 -07:00
kevinz000
f927793118 Merge pull request #11474 from kappa-sama/patch-17
halves the firebeath mutation's cooldown to 1 minute from 2 minutes
2020-03-15 23:03:10 -07:00
Seris02
259bb03969 fixes the swapping of buttons (#11475) 2020-03-16 01:57:55 +01:00
Ghommie
5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
Ghommie
2553384c6e Shortcut fix for a sticky situation. 2020-03-16 01:23:12 +01:00
Ghom
a1618a4550 Webedit fixing a runtime. 2020-03-16 00:35:19 +01:00
Ghommie
8af3d0e2fa Fixing a little issue with the musician trait etcetera. 2020-03-16 00:09:03 +01:00
Ghom
2b9f352a14 Fixing a couple issues with recyclers. 2020-03-15 22:12:55 +01:00
Hatterhat
802d37a399 borgs should be outclassed lategame and not hunt 2020-03-15 15:55:31 -05:00