shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,558 Commits 5 Branches 0 Tags
ebfafc24264e6b03bad94b32f6f2dfd513141e1d
Commit Graph

2557 Commits

Author SHA1 Message Date
LetterJay
ebfafc2426 Merge pull request #1953 from Citadel-Station-13/upstream-merge-29139 
[MIRROR] Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid
 2017-07-09 23:04:05 -05:00
LetterJay
0e81a33e95 Merge pull request #1946 from Citadel-Station-13/upstream-merge-29106 
[MIRROR] Chasm code cleanup
 2017-07-09 23:03:31 -05:00
CitadelStationBot
b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot
08eaad468a Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid 2017-07-09 06:43:42 -05:00
CitadelStationBot
4133d62161 [MIRROR] New portable generator icons (#1943) 
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-08 21:50:51 -07:00
LetterJay
c5c66777ab Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114 
[MIRROR] Fixes plasma glass merging with normal glass
 2017-07-08 14:33:41 -05:00
LetterJay
73adaf35a9 Merge pull request #1945 from Citadel-Station-13/upstream-merge-29112 
[MIRROR] Reinforced Plasma Glass is more SME-worthy
 2017-07-08 14:33:20 -05:00
LetterJay
bef2941681 Merge pull request #1950 from Citadel-Station-13/upstream-merge-29123 
[MIRROR] Refactors catching to use attack_hand
 2017-07-08 14:32:51 -05:00
CitadelStationBot
d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
CitadelStationBot
2d4604c94b Refactors catching to use attack_hand 2017-07-08 13:19:02 -05:00
CitadelStationBot
2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00
CitadelStationBot
220a844f4b Chasm code cleanup 2017-07-08 09:44:37 -05:00
CitadelStationBot
7dd32c4ad9 Reinforced Plasma Glass is more SME-worthy 2017-07-08 09:44:34 -05:00
CitadelStationBot
2e4624ee3f Make timer debug info more robust (#1942) 2017-07-07 23:49:10 -07:00
CitadelStationBot
9874978c5c Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940) 2017-07-07 23:48:49 -07:00
TalkingCactus
44206f3bf7 Update suicide.dm 
just close the game
 2017-07-07 18:50:13 -04:00
TalkingCactus
cb5247d060 Fixes Gamemode Voting & Map Edits (#1937) 
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
 2017-07-07 17:54:53 -04:00
LetterJay
29ef7a9338 Merge pull request #1935 from Citadel-Station-13/upstream-merge-29046 
[MIRROR] Adding the mook/wanderer mob for planetstation
 2017-07-07 15:17:45 -05:00
CitadelStationBot
7b52f001ed Adding the mook/wanderer mob for planetstation 2017-07-07 14:16:26 -05:00
CitadelStationBot
b42fb13549 Adds Headphones! 2017-07-07 12:44:47 -05:00
CitadelStationBot
b0cf4a2e37 Removed silicon SM interact message (#1929) 2017-07-07 10:35:55 -07:00
CitadelStationBot
998a75bc89 Makes martial arts not be deleted (#1931) 2017-07-07 10:35:40 -07:00
CitadelStationBot
29d2c7b980 Fixes permissions elevation exploit (#1930) 2017-07-07 10:35:17 -07:00
CitadelStationBot
9a4698874f Adds alarm sounds to SM (#1932) 2017-07-07 10:34:58 -07:00
CitadelStationBot
8525b2129e Windows now have the proper starting health (#1927) 2017-07-07 10:34:42 -07:00
CitadelStationBot
bdd9978dcf De-lags sandbox a bit (#1928) 2017-07-07 10:34:25 -07:00
CitadelStationBot
5dd25bda95 Minor Projectile Reflection Refactor (#1926) 2017-07-07 10:33:59 -07:00
CitadelStationBot
be5ad79fa2 Changes SM integrity rounding (#1925) 2017-07-07 10:33:45 -07:00
CitadelStationBot
be15914a6f Minor code clean up in magnet controller (#1921) 2017-07-07 04:47:52 -07:00
CitadelStationBot
6145b939fa Fix incorrect call to do_attack_animation (#1920) 2017-07-07 04:47:28 -07:00
CitadelStationBot
bf14c1dd61 Machine subsystem now checks qdel status (#1922) 2017-07-07 04:46:36 -07:00
LetterJay
ef4befcdd5 Merge pull request #1919 from Citadel-Station-13/upstream-merge-29071 
[MIRROR] Fixes world.internet_address in irc check
 2017-07-06 22:48:06 -05:00
LetterJay
8bfda97c09 Merge pull request #1918 from Citadel-Station-13/upstream-merge-28998 
[MIRROR] Actually fixes wormhole jaunters, and no it was not my fault.
 2017-07-06 22:47:51 -05:00
LetterJay
b87632669e Merge pull request #1917 from Citadel-Station-13/upstream-merge-29061 
[MIRROR] Warp cubes are slightly less instant but way cooler
 2017-07-06 22:47:38 -05:00
LetterJay
4cd1efd16c Merge pull request #1916 from Citadel-Station-13/upstream-merge-29075 
[MIRROR] Swords make sheathing/unsheating noises
 2017-07-06 22:47:19 -05:00
LetterJay
0db6b68bed Merge pull request #1915 from Citadel-Station-13/upstream-merge-29068 
[MIRROR] Lowercased computer names
 2017-07-06 22:47:04 -05:00
LetterJay
d08c18bf89 Merge pull request #1914 from Citadel-Station-13/upstream-merge-29037 
[MIRROR] Speeds up SSoverlays
 2017-07-06 22:46:46 -05:00
CitadelStationBot
cbecf48d2c Fixes world.internet_address in irc check 2017-07-06 20:56:24 -05:00
CitadelStationBot
ee830e7dc8 Actually fixes wormhole jaunters, and no it was not my fault. 2017-07-06 20:15:44 -05:00
CitadelStationBot
a101497539 Warp cubes are slightly less instant but way cooler 2017-07-06 20:12:38 -05:00
CitadelStationBot
55733ba0f4 Swords make sheathing/unsheating noises 2017-07-06 20:10:32 -05:00
CitadelStationBot
b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
CitadelStationBot
0eb8d9549a Speeds up SSoverlays 2017-07-06 19:21:40 -05:00
CitadelStationBot
5962b622f1 Doubles goonchat scroll snap tolerance 2017-07-06 19:20:36 -05:00
CitadelStationBot
2c09a344b7 [MIRROR] Fixes windows not returning an Initialize hint (#1902) 
* Fixes windows not returning an Initialize hint

* Update window.dm

* Delete window.dm.rej
 2017-07-06 14:15:30 -05:00
CitadelStationBot
2da7322cca [MIRROR] Gives ghost roles their own assigned_roles (#1887) 
* Gives ghost roles their own assigned_roles

* Update ghost_role_spawners.dm

* Delete ghost_role_spawners.dm.rej
 2017-07-06 14:15:12 -05:00
CitadelStationBot
24e0c88263 Removes the hot variants of necropolis tiles and walls (#1885) 2017-07-06 13:20:38 -05:00
LetterJay
db9b069075 re-adds headpatting (#1903) 2017-07-06 10:29:58 -07:00
LetterJay
dd70580a72 Merge pull request #1901 from Citadel-Station-13/upstream-merge-28992 
[MIRROR] Adds Necropolis curses for cursed items in Necropolis ruins
 2017-07-06 11:22:24 -05:00
LetterJay
c62086af13 Merge pull request #1900 from Citadel-Station-13/upstream-merge-28877 
[MIRROR] Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut.
 2017-07-06 10:56:52 -05:00