Commit Graph
30147 Commits
Author SHA1 Message Date
GhomandGitHub fdbef6a93c Update bin.dm 2020-02-13 13:10:36 +01:00
kevinz000andGitHub 4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
CitadelStationBot 913aa0b051 Automatic changelog generation for PR #10973 [ci skip] 2020-02-13 02:42:25 -06:00
GhomandGitHub a7d29ae830 Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
2020-02-13 09:42:22 +01:00
CitadelStationBot 1106ea86bc Automatic changelog generation for PR #10969 [ci skip] 2020-02-13 02:41:13 -06:00
GhomandGitHub 5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
CitadelStationBot 43ae33e737 Automatic changelog generation for PR #11027 [ci skip] 2020-02-13 02:40:25 -06:00
GhomandGitHub b3a530abc9 Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
2020-02-13 09:40:22 +01:00
CitadelStationBot 7d324c1b85 Automatic changelog generation for PR #10955 [ci skip] 2020-02-13 02:39:29 -06:00
GhomandGitHub 500ed0dd57 Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
2020-02-13 09:39:26 +01:00
GhomandGitHub bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
CitadelStationBot e5753b4fc0 Automatic changelog generation for PR #11026 [ci skip] 2020-02-13 02:36:13 -06:00
GhomandGitHub 380983bd10 Merge pull request #11026 from Trilbyspaceclone/patch-278
Makes ninja and wizards no longer spawn with suit sensors
2020-02-13 09:36:10 +01:00
CitadelStationBot 86667b4c1c Automatic changelog generation for PR #11024 [ci skip] 2020-02-13 02:28:38 -06:00
GhomandGitHub 721b647e3c Merge pull request #11024 from Citadel-Station-13/kevinz000-patch-5
Fixes brig cell timers, alternatively "WHO DECIDED TO USE NUMBER OF SECONDS FROM 2000 INSTEAD OF FROM THE CURRENT DAY"
2020-02-13 09:28:35 +01:00
GhomandGitHub 9d55e2d514 Merge pull request #11030 from InnocentFire/markings_notmammals.dmi-update
Update to markings_notmammals.dmi
2020-02-13 09:27:55 +01:00
deathride58andGitHub ac387e0655 Merge pull request #11059 from Citadel-Station-13/Ghommie-patch-1
oh damn, forgot those are numbers
2020-02-13 02:53:22 -05:00
GhomandGitHub 4f61f570ce Merge pull request #11058 from Citadel-Station-13/kevinz000-patch-16
geiger counter gc fix
2020-02-13 08:52:03 +01:00
GhomandGitHub 1fd8ebc2dc Update genitals.dm 2020-02-13 08:28:52 +01:00
GhomandGitHub e4a20a16a4 Update genitals.dm 2020-02-13 08:25:44 +01:00
GhomandGitHub 1ef3f45f89 Update genitals.dm 2020-02-13 08:22:08 +01:00
GhomandGitHub d9885cf278 oh damn, forgot those are numbers 2020-02-13 08:16:37 +01:00
kevinz000andGitHub 40111faab1 Update geiger_counter.dm 2020-02-13 00:12:25 -07:00
CitadelStationBot 358fe3d2e0 Automatic changelog generation for PR #10943 [ci skip] 2020-02-13 01:05:04 -06:00
kevinz000andGitHub 79f253e042 Merge pull request #10943 from Ghommie/Ghommie-cit562
Fixing an oversight with genital/Remove() and cleaning the code a little.
2020-02-13 00:05:01 -07:00
GhomandGitHub ee10c03630 Merge branch 'master' into Ghommie-cit562 2020-02-13 08:00:53 +01:00
kevinz000andGitHub f1e0c62141 Update gravity.dm 2020-02-12 23:59:03 -07:00
CitadelStationBot f0f043db49 Automatic changelog generation for PR #11012 [ci skip] 2020-02-13 00:58:16 -06:00
kevinz000andGitHub c790478a3d Merge pull request #11012 from keronshb/RatvarDrink
Introduces the Ratvarian mixed drink, the CogChamp!
2020-02-12 23:58:14 -07:00
CitadelStationBot ed6c35f170 Automatic changelog generation for PR #11005 [ci skip] 2020-02-13 00:57:53 -06:00
kevinz000andGitHub 5b01691834 Merge pull request #11005 from Arturlang/Hypospray_fix
Moves the hypospray mode change to CTRL click
2020-02-12 23:57:50 -07:00
CitadelStationBot ca7134ca92 Automatic changelog generation for PR #10987 [ci skip] 2020-02-13 00:56:55 -06:00
kevinz000andGitHub 4e419eed03 Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
2020-02-12 23:56:53 -07:00
Seris02andGitHub 4ac7fff7e3 ye 2020-02-13 13:37:47 +08:00
CitadelStationBot b682f9e730 Automatic changelog generation for PR #11029 [ci skip] 2020-02-12 22:01:10 -06:00
kevinz000andGitHub 4f9652f2d2 Merge pull request #11029 from Putnam3145/fix-that-dumb
Made the fallback if config is incorrect for map voting plurality (default)
2020-02-12 21:01:07 -07:00
ShadeAware 195760e572 h 2020-02-12 16:37:00 -05:00
ShadeAwareandGitHub 0f603f2aff Fixes icon state for the refill
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
TrilbyspacecloneandGitHub b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00
TrilbyspacecloneandGitHub 551a2593d4 Update color.dm 2020-02-12 14:28:57 -05:00
49a7657404 Correction
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-12 14:26:29 -05:00
CitadelStationBot 89936a1335 Automatic changelog generation for PR #10994 [ci skip] 2020-02-12 09:51:41 -06:00
GhomandGitHub 942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
2020-02-12 16:51:38 +01:00
CitadelStationBot f89d3907e9 Automatic changelog generation for PR #11043 [ci skip] 2020-02-12 08:35:05 -06:00
GhomandGitHub 2674fa6efc Merge pull request #11043 from Seris02/apcthingfix
fixes apc icons
2020-02-12 15:35:01 +01:00
Seris02 eb5835f668 fixes apcs 2020-02-12 21:35:51 +08:00
CitadelStationBot 88f063623e Automatic changelog generation for PR #11020 [ci skip] 2020-02-12 05:47:35 -06:00
GhomandGitHub 31c7a0e2be Merge pull request #11020 from Zellular/Animations1
Movement animations for the pupdozer
2020-02-12 12:47:32 +01:00
CitadelStationBot a7e24c33c2 Automatic changelog generation for PR #11018 [ci skip] 2020-02-12 04:14:30 -06:00
GhomandGitHub 8c2801fda6 Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
2020-02-12 11:14:27 +01:00