shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,310 Commits 5 Branches 0 Tags
443b49f7f2d730784b1ca9490ac9d245b9b8d3c9
Commit Graph
2225 Commits
Author SHA1 Message Date
LetterJayandGitHub 443b49f7f2 Merge pull request #3758 from Citadel-Station-13/upstream-merge-32306 
[MIRROR] Fix double progress bars when digging basalt
 2017-11-03 00:11:51 -05:00
LetterJayandGitHub dea89c9e01 Merge pull request #3756 from Citadel-Station-13/upstream-merge-32309 
[MIRROR] Makes walls call parent
 2017-11-03 00:11:29 -05:00
LetterJayandGitHub 05e71b2987 Merge pull request #3748 from Citadel-Station-13/upstream-merge-32273 
[MIRROR] [s] Adds admin logging to clockwork ark activation
 2017-11-02 23:51:39 -05:00
LetterJayandGitHub 5b890dc8a6 Merge pull request #3749 from Citadel-Station-13/upstream-merge-32288 
[MIRROR] Fixes hand tele adjacent attacks teleporting you
 2017-11-02 23:50:38 -05:00
LetterJayandGitHub 18e4c1c6a0 Merge pull request #3754 from Citadel-Station-13/upstream-merge-32282 
[MIRROR] Fix ghosts causing portals to spark
 2017-11-02 04:20:43 -05:00
Tad HardestyandCitadelStationBot 6f06e690a4 Fix double progress bars when digging basalt (#32306) 2017-11-02 04:11:07 -05:00
Emmett GainesandCitadelStationBot eb52a61437 makes walls call parent (#32309) 2017-11-02 04:08:44 -05:00
CitadelStationBotandGitHub 6a796ac32a Merge pull request #3739 from Citadel-Station-13/upstream-merge-32274 
[MIRROR] Ark examine now uses DisplayTimeText
 2017-11-02 04:07:23 -05:00
CitadelStationBotandGitHub b93d28d9aa Merge pull request #3736 from Citadel-Station-13/upstream-merge-32252 
[MIRROR] Reflector fixes and improvements
 2017-11-02 04:07:01 -05:00
CitadelStationBotandGitHub 9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942 
[MIRROR] Shuttle rotation refactor and significant performance upgrade
 2017-11-02 04:06:31 -05:00
Tad HardestyandCitadelStationBot 4e0a5bf3de Fix ghosts causing portals to spark 2017-11-02 01:24:50 -05:00
MoreRobustThanYouandCitadelStationBot 6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -05:00
LeoandCitadelStationBot cf6ee8d4c2 Merge pull request #32288 from kevinz000/patch-369 
Fixes hand tele adjacent attacks teleporting you
 2017-11-01 21:38:21 -05:00
kevinz000andCitadelStationBot fea6b185b0 Adds admin logging to clockwork ark activation (#32273) 2017-11-01 21:38:14 -05:00
MoreRobustThanYouandCitadelStationBot ebc768e31b Ark examine now uses DisplayTimeText (#32274) 
* Ark examine now uses DisplayTimeText
 2017-11-01 21:36:54 -05:00
LetterJayandGitHub 84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251 
[MIRROR] Nerfs peaceborg chain bucklestun
 2017-11-01 01:44:55 -04:00
LetterJayandGitHub 5d46fbb8d3 Merge pull request #3730 from Citadel-Station-13/upstream-merge-32250 
[MIRROR] Makes greyscaled cables' color viewable in map editing
 2017-11-01 01:44:05 -04:00
LetterJayandGitHub 18087ee261 Merge pull request #3720 from Citadel-Station-13/upstream-merge-31752 
[MIRROR] Makes varediting pneumatic cannon easier and makes the code less snowflake-y
 2017-11-01 01:41:10 -04:00
ACCountandCitadelStationBot cfaa6a9cd5 Reflector fixes and improvements 2017-10-31 21:01:45 -05:00
Emmett GainesandCitadelStationBot a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
AnturKandCitadelStationBot d792624dd8 Nerfs peaceborg chain bucklestun (#32251) 
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
 2017-10-31 17:40:03 -05:00
orangesandCitadelStationBot 59f3a714e2 Merge pull request #32250 from ninjanomnom/map-cable-color 
Makes greyscaled cables' color viewable in map editing
 2017-10-31 15:30:45 -05:00
kevinz000andCitadelStationBot d836803b53 Makes varediting pneumatic cannon easier and makes the code less snowflake-y (#31752) 
* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm
 2017-10-31 09:14:16 -05:00
kevinz000andCitadelStationBot 8a7f8c9bc6 Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring (#31769) 
* Add GetAllContentsIgnoring which accepts an ignore typecache to ignore

* Update turf.dm

* fixes

* Update unsorted.dm

* Update turf.dm
 2017-10-31 09:09:02 -05:00
LetterJayandGitHub 31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849 
[MIRROR] Comms console tweak
 2017-10-31 07:58:15 -04:00
CitadelStationBotandkevinz000 e7179ba02d [MIRROR] Removes force from slappers (#3711) 
* Merge pull request #32153 from tgstation/Cyberboss-patch-4

Removes force from slappers

* Removes force from slappers
 2017-10-31 00:43:48 -07:00
LetterJayandGitHub 60e1b62be8 Merge pull request #3708 from Citadel-Station-13/upstream-merge-32213 
[MIRROR] New ambience for ash storms
 2017-10-31 03:03:37 -04:00
LetterJayandGitHub 761acb5084 Merge pull request #3706 from Citadel-Station-13/upstream-merge-32134 
[MIRROR] Makes rollerbeds normal-sized items
 2017-10-31 03:02:43 -04:00
LetterJayandGitHub cfae6fc672 Merge pull request #3704 from Citadel-Station-13/upstream-merge-32146 
[MIRROR] Fixes rollies not being effective
 2017-10-31 03:01:56 -04:00
LetterJayandGitHub cec63d54f4 Merge pull request #3700 from Citadel-Station-13/upstream-merge-32191 
[MIRROR] Fixes latejoin/mulligan traitors.
 2017-10-31 03:00:36 -04:00
LetterJayandGitHub 157817f5dc Merge pull request #3699 from Citadel-Station-13/upstream-merge-32210 
[MIRROR] fixes clockcults appearing as grey box on sechuds until they reequip their id
 2017-10-31 03:00:19 -04:00
LetterJayandGitHub 66bacbfedc Merge pull request #3698 from Citadel-Station-13/upstream-merge-32209 
[MIRROR] Fixes mech recharger integrity bar
 2017-10-31 03:00:08 -04:00
LetterJayandGitHub 8923b75a74 Merge pull request #3697 from Citadel-Station-13/upstream-merge-32211 
[MIRROR] Fixes cyborg upgrades not applying to held items
 2017-10-31 02:59:58 -04:00
LetterJayandGitHub 6ba4300f6e Merge pull request #3696 from Citadel-Station-13/upstream-merge-32212 
[MIRROR] fixes radios being perma-stuck on when emped
 2017-10-31 02:59:32 -04:00
LetterJayandGitHub 98874b1f05 Merge pull request #3695 from Citadel-Station-13/upstream-merge-32215 
[MIRROR] fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
 2017-10-31 02:59:14 -04:00
LetterJayandGitHub 8c1dcd9429 Merge pull request #3692 from Citadel-Station-13/upstream-merge-31986 
[MIRROR] You can now hide grenades in plushies
 2017-10-30 23:33:16 -04:00
LetterJayandGitHub 09a198fb65 Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225 
[MIRROR] Deterministic output slots for smartfridges
 2017-10-30 23:32:39 -04:00
LetterJayandGitHub f80bb03a23 Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238 
[MIRROR] welder refuelling hotfix
 2017-10-30 23:30:22 -04:00
LetterJayandGitHub 21d4ed4a5f Merge pull request #3685 from Citadel-Station-13/upstream-merge-32200 
[MIRROR] Adds force to items that lack force and shouldn't.
 2017-10-30 22:14:15 -04:00
LetterJayandGitHub d3b5b64a51 Merge branch 'master' into upstream-merge-32238 2017-10-30 22:13:51 -04:00
LetterJayandGitHub 4dbcce6885 Merge pull request #3683 from Citadel-Station-13/upstream-merge-32143 
[MIRROR] Allows filling welders from open containers that have welding fuel in them
 2017-10-30 22:12:04 -04:00
LetterJayandGitHub 636e2a6d90 Update grenade.dm 2017-10-30 17:32:08 -05:00
Emmett GainesandCitadelStationBot 6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
Jordan BrownandCitadelStationBot f6ebb15fbd Merge pull request #32134 from Anonmare/patch-8 
Makes rollerbeds normal-sized items
 2017-10-30 15:09:49 -05:00
Jordan BrownandCitadelStationBot 2855553b4e Merge pull request #32146 from PKPenguin321/patch-20 
Fixes rollies not being effective
 2017-10-30 15:01:24 -05:00
Jordan BrownandCitadelStationBot 3973e94e3f Merge pull request #32191 from AnturK/latetraitorfixup 
Fixes latejoin/mulligan traitors.
 2017-10-30 14:50:33 -05:00
Jordan BrownandCitadelStationBot a9d440c457 Merge pull request #32210 from kevinz000/patch-361 
fixes clockcults appearing as grey box on sechuds until they reequip their id
 2017-10-30 14:42:17 -05:00
Jordan BrownandCitadelStationBot 4b0362e208 Merge pull request #32209 from YPOQ/mechrechargerfix 
Fixes mech recharger integrity bar
 2017-10-30 14:41:08 -05:00
Jordan BrownandCitadelStationBot b859a3f1aa Merge pull request #32211 from YPOQ/borgupgradefix 
Fixes cyborg upgrades not applying to held items
 2017-10-30 14:40:57 -05:00
kevinz000andCitadelStationBot 0efaf92b6f fixes radios being perma-stuck on when emped (#32212) 
* fix radio emps

* woops forgot something!

* Update headset.dm
 2017-10-30 14:38:46 -05:00