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

5666 Commits

Author SHA1 Message Date
Jordan Brown
55653fa1ee Replace most islist calls in components with length() (#32158) 
islist was used to check if a thing was

A. A list of things
B. 1 thing

length was profiled to be faster
 2017-10-31 15:12:42 -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
Michiyamenotehifunana
f25c1b5cce CRITICAL FIX FOR EXPLODING TOYS 
OH GOD THIS IS SUCH A HILLARIOUS OVERSIGHT
 2017-10-31 19:00:04 +08: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
CitadelStationBot
125f81de08 [MIRROR] Use associative list instead of in (#3710) 
* Merge pull request #32128 from Cyberboss/LocateFix

Use associative list instead of `in`

* Use associative list instead of `in`
 2017-10-31 00:43:39 -07:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118 
[MIRROR] actually fixes not being able to stop wagging your tail this time
 2017-10-31 03:03:58 -04: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
1d992f2dfd Merge pull request #3705 from Citadel-Station-13/upstream-merge-32222 
[MIRROR] Ignore verb now also shows ghost names
 2017-10-31 03:02:05 -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
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123 
[MIRROR] Removes statues from the gold slime pool
 2017-10-31 03:01:34 -04:00
LetterJay
a0f3edf6ca Merge pull request #3701 from Citadel-Station-13/upstream-merge-32150 
[MIRROR] Meteor gating tweaks
 2017-10-31 03:00:49 -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
32fb136bf0 Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855 
[MIRROR] Dullahans
 2017-10-30 23:54:25 -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
53314289c8 Merge branch 'master' into upstream-merge-31855 2017-10-30 23:31:13 -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
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214 
[MIRROR] Fixes old simple animal humanoid issues
 2017-10-30 22:14:32 -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
df6bd6fa4c Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140 
[MIRROR] Fixes filling smoke machines with pills
 2017-10-30 22:11:44 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041 
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
 2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
LetterJay
636e2a6d90 Update grenade.dm 2017-10-30 17:32:08 -05:00
kevinz000
93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -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
909f1ba244 Merge pull request #32222 from AnturK/ignoreprovement 
Ignore verb now also shows ghost names
 2017-10-30 15:06:37 -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
jughu
b6fea33316 Removes statues from the gold slime pool (#32123) 
* Update statue.dm

* Update statue.dm
 2017-10-30 14:53:56 -05:00
Jordan Brown
ba1d3fd2c2 Merge pull request #32150 from MrStonedOne/patch-442 
Meteor gating tweaks
 2017-10-30 14:51:44 -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
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214) 
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
 2017-10-30 06:50:04 -05:00
LetterJay
241d2d88e6 Merge pull request #3688 from Citadel-Station-13/upstream-merge-32156 
[MIRROR] Fixes TakeComponent
 2017-10-30 07:11:14 -04:00
LetterJay
b6a04b6649 Merge pull request #3689 from Citadel-Station-13/CharacterCreation 
Fixes character issues on creation
 2017-10-30 07:02:15 -04:00