shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,879 Commits 5 Branches 0 Tags
aa774aeaeaf97e5dfcbfa58cb5f6664aecdae217
Commit Graph

11879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tad Hardesty
aa774aeaea Fix MMIs in mechs and firesuits being burned by ash storms (#34349) 2018-01-15 02:58:24 -06:00
CitadelStationBot
a7b75651f9 Automatic changelog generation for PR #4829 [ci skip] 2018-01-15 00:19:02 -06:00
deathride58
c63028e8bc Merge pull request #4829 from Citadel-Station-13/upstream-merge-34384 
[MIRROR] Quality of life: Newly constructed APCS are unlocked
 2018-01-15 06:18:59 +00:00
deathride58
14ae9ace64 Merge pull request #4831 from Citadel-Station-13/upstream-merge-34374 
[MIRROR] Rocket Pods now require manual disassembly
 2018-01-15 06:18:29 +00:00
CitadelStationBot
63660230cc Automatic changelog generation for PR #4837 [ci skip] 2018-01-15 00:18:12 -06:00
deathride58
741dba1a9f Merge pull request #4837 from Citadel-Station-13/upstream-merge-34373 
[MIRROR] The Express Console emag effect is now a proper emag effect
 2018-01-15 06:18:10 +00:00
CitadelStationBot
9322438870 Automatic changelog generation for PR #4836 [ci skip] 2018-01-15 00:17:53 -06:00
deathride58
2b859638e9 Merge pull request #4836 from Citadel-Station-13/upstream-merge-34396 
[MIRROR] Fixed alt-click not working with stacks
 2018-01-15 06:17:51 +00:00
CitadelStationBot
0c79992b49 Automatic changelog generation for PR #4835 [ci skip] 2018-01-15 00:17:32 -06:00
deathride58
f7a47b226c Merge pull request #4835 from Citadel-Station-13/upstream-merge-34416 
[MIRROR] Use space heaters for their designed purpose
 2018-01-15 06:17:30 +00:00
CitadelStationBot
e16261f245 Automatic changelog generation for PR #4834 [ci skip] 2018-01-15 00:17:08 -06:00
deathride58
d61069dc84 Merge pull request #4834 from Citadel-Station-13/upstream-merge-34409 
[MIRROR] Fixes monkeymode shit
 2018-01-15 06:17:06 +00:00
deathride58
b0e036a7fd Merge pull request #4833 from Citadel-Station-13/upstream-merge-34417 
[MIRROR] Removes SS_KEEP_TIMING from SSprojectiles
 2018-01-15 06:16:42 +00:00
deathride58
a886b53253 Merge pull request #4832 from Citadel-Station-13/upstream-merge-34395 
[MIRROR] fixes for mouse race
 2018-01-15 06:16:17 +00:00
CitadelStationBot
cad097c093 Automatic changelog generation for PR #4830 [ci skip] 2018-01-15 00:16:02 -06:00
deathride58
7aa16095cd Merge pull request #4830 from Citadel-Station-13/upstream-merge-34372 
[MIRROR] Fixes players not being immune to their own slime timestops
 2018-01-15 06:16:00 +00:00
CitadelStationBot
a2b037c319 The Express Console emag effect is now a proper emag effect 2018-01-14 23:48:55 -06:00
Iamgoofball
dcd61e0ba4 The Express Console emag effect is now a proper emag effect (#34373) 
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
 2018-01-14 23:48:55 -06:00
CitadelStationBot
8bad0f2334 Fixed alt-click not working with stacks 2018-01-14 22:05:07 -06:00
John Ginnane
ac1b2f76ef Fixed alt-click not working with stacks (#34396) 
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
 2018-01-14 22:05:07 -06:00
CitadelStationBot
4a985886e0 Use space heaters for their designed purpose 2018-01-14 22:03:57 -06:00
F-OS
af1d40ca52 Tweaks spaceheater description (#34416) 
* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Update spaceheater.dm

* Allah my loving lord and savior grant me mercy
 2018-01-14 22:03:57 -06:00
CitadelStationBot
053d5ec642 Fixes monkeymode shit 2018-01-14 22:02:47 -06:00
Jordan Brown
29a3a196b4 Merge pull request #34409 from MoreRobustThanYou/patch-45 
Fixes monkeymode shit
 2018-01-14 22:02:47 -06:00
CitadelStationBot
2354e2876a Removes SS_KEEP_TIMING from SSprojectiles 2018-01-14 22:02:41 -06:00
Jordan Brown
29f0dc8006 Merge pull request #34417 from kevinz000/patch-431 
Removes SS_KEEP_TIMING from SSprojectiles
 2018-01-14 22:02:40 -06:00
CitadelStationBot
f4db6b250c fixes for mouse race 2018-01-14 22:01:31 -06:00
Tlaltecuhtli
37fa7830ec Fixes eating mouse grammar (#34395) 2018-01-14 22:01:31 -06:00
CitadelStationBot
23b9d93cc9 Rocket Pods now require manual disassembly 2018-01-14 21:59:20 -06:00
Iamgoofball
a5a1838bcb Rocket Pods now require manual disassembly (#34374) 
Bluespacing out simply wasn't metal enough tbh
 2018-01-14 21:59:20 -06:00
CitadelStationBot
b24551d995 Fixes players not being immune to their own slime timestops 2018-01-14 21:35:50 -06:00
Leo
4b56baf1a6 Merge pull request #34372 from YPOQ/slimestopfix 
Fixes players not being immune to their own slime timestops
 2018-01-14 21:35:50 -06:00
CitadelStationBot
33f8d80d9a Quality of life: Newly constructed APCS are unlocked 2018-01-14 21:32:39 -06:00
Leo
2b4735ded0 Merge pull request #34384 from F-OS/patch-3 
Quality of life: Newly constructed APCS are unlocked
 2018-01-14 21:32:38 -06:00
CitadelStationBot
969a8ac9ef Automatic changelog generation for PR #4828 [ci skip] 2018-01-14 20:09:47 -06:00
deathride58
0933e33db2 Merge pull request #4828 from Citadel-Station-13/upstream-merge-34246 
[MIRROR] Added tooltips to roundend traitor purchase logs
 2018-01-15 02:09:44 +00:00
deathride58
071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges
ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -06:00
deathride58
f9b7d872e6 Merge pull request #4827 from Citadel-Station-13/upstream-merge-34392 
[MIRROR] fixes chest being behind the tentacle
 2018-01-14 22:05:26 +00:00
CitadelStationBot
2235a05977 fixes chest being behind the tentacle 2018-01-14 15:42:06 -06:00
Tlaltecuhtli
ac14a5b4e8 sfds (#34392) 2018-01-14 15:42:06 -06:00
CitadelStationBot
8ebe0760ff Automatic changelog generation for PR #4821 [ci skip] 2018-01-14 15:12:03 -06:00
deathride58
c3ce0d8f28 Merge pull request #4821 from Citadel-Station-13/wagfix2018 
Fixes *wag for mammals
 2018-01-14 21:12:01 +00:00
CitadelStationBot
2935a9f713 Automatic changelog generation for PR #4825 [ci skip] 2018-01-14 14:42:42 -06:00
deathride58
6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123 
[MIRROR] Moves GLOB.movement_keys into SSinput and adds movement direction badminry
 2018-01-14 20:42:40 +00:00
CitadelStationBot
45e4374a0d Automatic changelog generation for PR #4823 [ci skip] 2018-01-14 14:42:15 -06:00
deathride58
96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility 
Fixes message visibility for vorish play
 2018-01-14 20:42:13 +00:00
CitadelStationBot
1d80b18d6f Automatic changelog generation for PR #4822 [ci skip] 2018-01-14 14:41:44 -06:00
deathride58
2c6ef0a90a Merge pull request #4822 from Citadel-Station-13/ak47s4er1 
Re-adds AK-47s button
 2018-01-14 20:41:42 +00:00
CitadelStationBot
0d3362f174 Moves GLOB.movement_keys into SSinput and adds movement direction badminry 2018-01-14 13:39:01 -06:00