Commit Graph

30176 Commits

Author SHA1 Message Date
CitadelStationBot
dedcfc35ca Automatic changelog generation for PR #11035 [ci skip] 2020-02-13 09:42:13 -06:00
Ghom
91824571ff Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
2020-02-13 16:42:10 +01:00
CitadelStationBot
fc873f9626 Automatic changelog generation for PR #10997 [ci skip] 2020-02-13 09:40:15 -06:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
CitadelStationBot
3d181e4616 Automatic changelog generation for PR #11022 [ci skip] 2020-02-13 08:06:30 -06:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
CitadelStationBot
61a6f3e95e Automatic changelog generation for PR #11038 [ci skip] 2020-02-13 08:05:54 -06:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
kevinz000
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
Winter Flare
3b5ec22076 Vendor Nerf 2020-02-13 03:54:31 -05:00
CitadelStationBot
913aa0b051 Automatic changelog generation for PR #10973 [ci skip] 2020-02-13 02:42:25 -06:00
Ghom
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
Ghom
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
Ghom
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
Ghom
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
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
Winter Flare
0b008db5e6 Import Cogchamp 2020-02-13 03:36:54 -05:00
CitadelStationBot
e5753b4fc0 Automatic changelog generation for PR #11026 [ci skip] 2020-02-13 02:36:13 -06:00
Ghom
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
Winter Flare
ac55d1d25d Merge branch 'master' into tinytweaks-2-9-20 2020-02-13 03:34:44 -05:00
CitadelStationBot
86667b4c1c Automatic changelog generation for PR #11024 [ci skip] 2020-02-13 02:28:38 -06:00
Ghom
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
Ghom
9d55e2d514 Merge pull request #11030 from InnocentFire/markings_notmammals.dmi-update
Update to markings_notmammals.dmi
2020-02-13 09:27:55 +01:00
Winter Flare
f32affdb1c Made Mugs Colorful 2020-02-13 03:26:35 -05:00
deathride58
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
Ghom
4f61f570ce Merge pull request #11058 from Citadel-Station-13/kevinz000-patch-16
geiger counter gc fix
2020-02-13 08:52:03 +01:00
Ghom
1fd8ebc2dc Update genitals.dm 2020-02-13 08:28:52 +01:00
Ghom
e4a20a16a4 Update genitals.dm 2020-02-13 08:25:44 +01:00
Ghom
1ef3f45f89 Update genitals.dm 2020-02-13 08:22:08 +01:00
Ghom
d9885cf278 oh damn, forgot those are numbers 2020-02-13 08:16:37 +01:00
kevinz000
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
kevinz000
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
Ghom
ee10c03630 Merge branch 'master' into Ghommie-cit562 2020-02-13 08:00:53 +01:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
Seris02
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
kevinz000
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
ShadeAware
0f603f2aff Fixes icon state for the refill
Thank you for the catch, Ghommie.
2020-02-12 16:34:16 -05:00
Trilbyspaceclone
b7c3582d86 Update outfit.dm 2020-02-12 14:29:19 -05:00