Commit Graph
32026 Commits
Author SHA1 Message Date
CitadelStationBot bd0514fffc Automatic changelog generation for PR #11511 [ci skip] 2020-03-18 14:37:30 -05:00
nik707andGitHub 9b71b1a9a2 Merge pull request #11511 from EmeraldSundisk/cogshuttles
Let's just start with the shuttles.
2020-03-18 14:37:27 -05:00
kevinz000andGitHub 6758761a65 Update action.dm (#11521) 2020-03-18 19:44:33 +01:00
CitadelStationBot 6b5bc5f45d Automatic changelog generation for PR #11516 [ci skip] 2020-03-18 13:34:17 -05:00
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
CitadelStationBot cc454899c4 Automatic changelog generation for PR #11519 [ci skip] 2020-03-18 13:23:22 -05:00
Seris02andGitHub fb0925047a mentor fixes and improvements (#11519)
* one teensy fix but imma go do something else quick

* yee?

* yee?

* yee 3

* ah shit

* uhhhhhh

* oh
2020-03-18 19:23:19 +01:00
kevinz000andGitHub 88bb9d8f1d Update sword_point.dm (#11523) 2020-03-18 19:20:56 +01:00
CitadelStationBot 4e69cf0151 Automatic changelog generation for PR #11494 [ci skip] 2020-03-18 05:35:31 -05:00
kevinz000andGitHub 8fbdae375c Merge pull request #11494 from Detective-Google/hudpatches
Adds craftable HUDpatches, similar to the HoS'
2020-03-18 03:35:28 -07:00
CitadelStationBot e0fe2c26ad Automatic changelog generation for PR #11506 [ci skip] 2020-03-18 05:35:10 -05:00
kevinz000andGitHub b113166c3e Merge pull request #11506 from zeroisthebiggay/kevinzdemandsthefix
Big Box Brig Boogaloo (kevinzs requests and stuffs)
2020-03-18 03:35:08 -07:00
CitadelStationBot 6eb5b1b609 Automatic changelog generation for PR #11505 [ci skip] 2020-03-17 21:15:15 -05:00
kevinz000andGitHub c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
Putnam3145andGitHub 239a805c45 Merge pull request #11513 from Citadel-Station-13/Linzolle-patch-2
[s] fix beakers not emptying when thrown at mob
2020-03-17 18:32:17 -07:00
LinandGitHub 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 1b72357925 might as well throw the other in whilst I wait. 2020-03-17 16:26:26 -05:00
Detective Google 72f086c79e one at a time perhaps. 2020-03-17 16:24:23 -05:00
Detective Google e8d09b470d nobody can figure out why this isn't working :) 2020-03-17 16:22:42 -05:00
Detective Google af872d1476 push 2020-03-17 16:10:15 -05:00
Detective Google 37aaac60e3 third times the charm 2020-03-17 16:07:25 -05:00
Detective Google f7c9762583 icon conflicts suck 2020-03-17 16:00:24 -05:00
Detective Google 93ceaa0157 Revert "h^2"
This reverts commit df45abfd0f.
2020-03-17 15:56:57 -05:00
Detective Google df45abfd0f h^2 2020-03-17 15:55:07 -05:00
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