shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,283 Commits 5 Branches 0 Tags
c3fab199be58efecf4e33e78af708e44dbe44160
Commit Graph

2215 Commits

Author SHA1 Message Date
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
MoreRobustThanYou
6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -05:00
MoreRobustThanYou
ebc768e31b Ark examine now uses DisplayTimeText (#32274) 
* Ark examine now uses DisplayTimeText
 2017-11-01 21:36:54 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
ACCount
cfaa6a9cd5 Reflector fixes and improvements 2017-10-31 21:01:45 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
AnturK
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
oranges
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
kevinz000
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
kevinz000
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
LetterJay
31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849 
[MIRROR] Comms console tweak
 2017-10-31 07:58:15 -04:00
CitadelStationBot
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
f80bb03a23 Merge pull request #3684 from Citadel-Station-13/upstream-merge-32238 
[MIRROR] welder refuelling hotfix
 2017-10-30 23:30:22 -04:00
LetterJay
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
LetterJay
d3b5b64a51 Merge branch 'master' into upstream-merge-32238 2017-10-30 22:13:51 -04:00
LetterJay
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
LetterJay
636e2a6d90 Update grenade.dm 2017-10-30 17:32:08 -05:00
Emmett Gaines
6f940baa0a New ambience for ash storms (#32213) 
song name?
 2017-10-30 15:22:23 -05:00
Jordan Brown
f6ebb15fbd Merge pull request #32134 from Anonmare/patch-8 
Makes rollerbeds normal-sized items
 2017-10-30 15:09:49 -05:00
Jordan Brown
2855553b4e Merge pull request #32146 from PKPenguin321/patch-20 
Fixes rollies not being effective
 2017-10-30 15:01:24 -05:00
Jordan Brown
3973e94e3f Merge pull request #32191 from AnturK/latetraitorfixup 
Fixes latejoin/mulligan traitors.
 2017-10-30 14:50:33 -05:00
Jordan Brown
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 Brown
4b0362e208 Merge pull request #32209 from YPOQ/mechrechargerfix 
Fixes mech recharger integrity bar
 2017-10-30 14:41:08 -05:00
Jordan Brown
b859a3f1aa Merge pull request #32211 from YPOQ/borgupgradefix 
Fixes cyborg upgrades not applying to held items
 2017-10-30 14:40:57 -05:00
kevinz000
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
Jordan Brown
b6343c813b Merge pull request #32215 from kevinz000/patch-363 
fixes sinks applying baton stunforce to stutter without proper conversion between tick and mob life counting.
 2017-10-30 14:37:37 -05:00
vuonojenmustaturska
5bd7184d9c Deterministic output slots for smartfridges (#32225) 
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
 2017-10-30 14:35:26 -05:00
Ashe Higgs
0c4c4dc1f2 You can now hide grenades in plushies 2017-10-30 14:34:01 -05:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING 
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
 2017-10-30 15:01:37 +08:00
LetterJay
1fe4eb7d88 Merge pull request #3508 from Michiyamenotehifunana/recolorable-guns 
Recolorable Guns and more ballistics for Security
 2017-10-29 23:43:20 -04:00
LetterJay
0256d9af4a Update tools.dm 2017-10-29 22:41:56 -05:00
bgobandit
119129a80c Adds force to items that really should hurt when hit by (#32200) 2017-10-29 18:49:48 -05:00
PKPenguin321
36893d3188 welder refuelling hotfix 2017-10-29 17:23:15 -05:00
PKPenguin321
ebef4e6607 Allows filling welders from open containers that have welding fuel in them (#32143) 
🆑
tweak: You can now use beakers/cups/etc that have welding fuel in them on welders to refuel them.
/🆑

Closes #31339
 2017-10-29 16:55:38 -05:00
LetterJay
5a92bafa75 Merge pull request #3670 from Citadel-Station-13/upstream-merge-31966 
[MIRROR] Spooky Spectral Instruments
 2017-10-29 15:51:17 -04:00