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

2571 Commits

Author SHA1 Message Date
LetterJay
e10760e1a5 Merge pull request #1963 from Citadel-Station-13/upstream-merge-29143 
[MIRROR] Fixes race condition with admin proc calls and load admins
 2017-07-09 23:06:47 -05:00
LetterJay
b4eee0a1c4 Merge pull request #1962 from Citadel-Station-13/upstream-merge-29145 
[MIRROR] Updates vending refill packs to reflect additional items added in headphones PR
 2017-07-09 23:06:28 -05:00
LetterJay
ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140 
[MIRROR] Removes now-unnecessary obj_integrity definitions
 2017-07-09 23:06:13 -05:00
LetterJay
08e044a522 Merge pull request #1960 from Citadel-Station-13/upstream-merge-29141 
[MIRROR] Necropolis curse mobs no longer fall into chasms
 2017-07-09 23:05:53 -05:00
LetterJay
19f805acc3 Merge pull request #1959 from Citadel-Station-13/upstream-merge-29134 
[MIRROR] Allows drones to switch to/from harm intent
 2017-07-09 23:05:42 -05:00
LetterJay
2a0e31f0f2 Merge pull request #1955 from Citadel-Station-13/upstream-merge-29136 
[MIRROR] Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds
 2017-07-09 23:04:45 -05:00
LetterJay
5aa2fe3666 Merge pull request #1954 from Citadel-Station-13/upstream-merge-29127 
[MIRROR] Fixes entire stacks of goliath plates being used on mechs
 2017-07-09 23:04:17 -05:00
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
060c7b9dec Fixes race condition with admin proc calls and load admins 2017-07-09 19:49:00 -05:00
CitadelStationBot
d64469ccda Updates vending refill packs to reflect additional items added in headphones PR 2017-07-09 19:45:53 -05:00
CitadelStationBot
90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot
b24f98c1e2 Necropolis curse mobs no longer fall into chasms 2017-07-09 19:44:43 -05:00
CitadelStationBot
0f6ff169aa Allows drones to switch to/from harm intent 2017-07-09 19:44:40 -05:00
CitadelStationBot
b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot
5a11f53535 Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds 2017-07-09 06:44:49 -05:00
CitadelStationBot
9d85345b6d Fixes entire stacks of goliath plates being used on mechs 2017-07-09 06:44:46 -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