shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,526 Commits 5 Branches 0 Tags
df53b2166672fa8bfe6903efe8de6cfe0da255a1
Commit Graph

4647 Commits

Author SHA1 Message Date
LetterJay
df53b21666 Merge pull request #3180 from Citadel-Station-13/upstream-merge-31314 
[MIRROR] Fixes outdated away code.
 2017-10-07 01:04:19 -04:00
LetterJay
edce74eb51 Merge pull request #3179 from Michiyamenotehifunana/toyguns 
Adds more toy guns
 2017-10-07 01:04:03 -04:00
LetterJay
54fe9d3d96 Merge pull request #3178 from Citadel-Station-13/upstream-merge-31330 
[MIRROR] Fixes runed metal and brass sprites
 2017-10-07 01:03:35 -04:00
LetterJay
f9dcfc6e35 Merge pull request #3177 from Citadel-Station-13/upstream-merge-31333 
[MIRROR] Sets turf decal layer
 2017-10-07 01:03:25 -04:00
LetterJay
46ec25b161 Merge pull request #2603 from deathride58/crewobjectivesandmiscreants 
Ports Goon's Crew Objectives (feat. objectives from old Hippie) and Miscreants
 2017-10-07 01:02:37 -04:00
LetterJay
c7617dc4a4 Merge pull request #3169 from Citadel-Station-13/upstream-merge-31326 
[MIRROR] Cleans up leftover Hand of God gamemode references
 2017-10-07 01:02:12 -04:00
LetterJay
493352f680 Update stationCollision.dm 2017-10-06 22:23:31 -05:00
LetterJay
2b42ad5200 Update decal.dm 2017-10-06 22:22:35 -05:00
LetterJay
3f6d7d5244 Merge pull request #3176 from Citadel-Station-13/upstream-merge-31338 
[MIRROR] Fix spelling of conscious
 2017-10-06 23:20:58 -04:00
LetterJay
da2ee4b4b1 Update _defines.dm 2017-10-06 22:20:27 -05:00
Michiyamenotehifunana
8774ef6914 Boolean memes 
No more zeroes or ones, only TRUE and FALSE. Well, for the toy stuff anyways. The rest of the guns will have a boolean fixing thing later.
 2017-10-07 09:03:14 +08:00
WewLads
7f77e08c0b Changed OneHuman to OneCrew lawset (#3172) 
* You can now slap butts

Disarm Intent + Target Groin = Butt Slap. Deals 1 damage to both the
victim's torso and the target's active hand.

* Fixed the drying rack

* Changes OneCrew to OneHuman

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Revert "Revert "Changes OneCrew to OneHuman""

This reverts commit bc0f46d387ff7cd621b5331ad4d916f4a49ff2f0.

* Revert "Changes OneCrew to OneHuman"

This reverts commit 34e2ae378acff838013ed9c15ff85901740e9cdd.

* Changed OneHuman to OneCrew

* Revert "Fixed the drying rack"

This reverts commit 1351e2f38ed819b734a558fbeb9ef839cddf2b8f.

* Revert "You can now slap butts"

This reverts commit 9b1d6808d8e24cc9b2f5d28384b3ffe633d811fe.
 2017-10-06 11:36:52 -07:00
deathride58
16e7cdea6c makes chemist druglord objective harder to cheese 2017-10-06 10:10:02 -04:00
deathride58
7ca2bd48a5 Crew objectives no longer count towards antags greentexting 2017-10-06 09:56:42 -04:00
deathride58
39d3897b29 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-06 09:39:20 -04:00
AnturK
848968834a Fixes outdated away code. 2017-10-06 07:10:36 -05:00
Michiyamenotehifunana
1d4078cd63 Adds more toy guns 
moar foam moar lasertag
 2017-10-06 16:24:30 +08:00
Xhuis
97e5c9b590 Fixes runed metal and brass sprites 2017-10-06 03:19:23 -05:00
ShizCalev
0dc8bd5d83 Sets turf decal layer 2017-10-06 03:12:07 -05:00
oranges
5a390937ae Fix spelling of conscious 2017-10-06 01:34:33 -05:00
LetterJay
6ce704ce21 Merge pull request #3170 from Citadel-Station-13/upstream-merge-31325 
[MIRROR] Makes Ocular Wardens effective again
 2017-10-06 02:14:15 -04:00
LetterJay
3fef939f20 Merge pull request #3168 from Citadel-Station-13/upstream-merge-31321 
[MIRROR] Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy()
 2017-10-06 02:14:03 -04:00
LetterJay
8c6f145087 Merge pull request #3167 from Citadel-Station-13/upstream-merge-31316 
[MIRROR] Fixes rubber shot after unintended nerf.
 2017-10-06 02:13:51 -04:00
LetterJay
d21f68028d Merge pull request #3166 from Citadel-Station-13/upstream-merge-31315 
[MIRROR] Removes shitty sleep from area/Entered
 2017-10-06 02:13:22 -04:00
LetterJay
d4f4b711a0 Merge pull request #3164 from Citadel-Station-13/upstream-merge-31317 
[MIRROR] Removes old ass belt.dm
 2017-10-06 02:13:03 -04:00
LetterJay
020b3b1160 Merge pull request #3163 from Citadel-Station-13/upstream-merge-31240 
[MIRROR] Emotes now shatter 80% less immersions
 2017-10-06 02:12:43 -04:00
LetterJay
57a92cf9f4 Merge pull request #3162 from Citadel-Station-13/upstream-merge-30989 
[MIRROR] Makes angle2dir() much more accurate
 2017-10-06 02:12:35 -04:00
LetterJay
6546804c38 Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525 
[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
 2017-10-06 02:12:06 -04:00
LetterJay
98545cd5c3 Merge pull request #3158 from Citadel-Station-13/upstream-merge-31298 
[MIRROR] Fixes crafting stacks without breaking crafted machinery
 2017-10-06 02:11:45 -04:00
LetterJay
bc2988dc74 Merge pull request #3157 from Citadel-Station-13/upstream-merge-31304 
[MIRROR] Adds wigs
 2017-10-06 02:11:32 -04:00
LetterJay
d50c1034b9 Update type2type.dm 2017-10-05 22:44:50 -05:00
LetterJay
52c57543cb Update misc_special.dm 2017-10-05 22:43:08 -05:00
Joan Lung
4d06415a4b Makes Ocular Wardens effective again (#31325) 
* Makes Ocular Wardens effective again

* get that, too
 2017-10-05 19:22:29 -05:00
ShizCalev
20c5749416 Cleans up leftover Hand of God gamemode references 2017-10-05 18:17:21 -05:00
vuonojenmustaturska
648040de9c Makes a couple of atmos procs a tiny bit faster, removes /datum/gas_mixture/thermal_energy() (#31321) 
* Atmos stuff

* moved the define
 2017-10-05 17:58:54 -05:00
The-clown-known-as-Pepe
13eedff767 Fixes rubber shot after unintended nerf. (#31316) 
* Update bullets.dm

* fix

* refactor

* Update ammo_casings.dm
 2017-10-05 17:48:37 -05:00
oranges
645d8fdc7c Merge pull request #31315 from tgstation/Cyberboss-patch-3 
Removes shitty sleep from area/Entered
 2017-10-05 17:43:23 -05:00
Jordan Brown
b3243d5900 Removes old ass belt.dm (#31317) 2017-10-05 15:31:56 -05:00
Robustin
c8e5928517 Emotes now shatter 80% less immersions (#31240) 
* Emote Checks by Default

* Removes emote argument

* More emote fixes

* Overhauled emote check

* Closed Spans
 2017-10-05 15:11:28 -05:00
Joan Lung
2a75083f80 Makes angle2dir() much more accurate 2017-10-05 15:05:13 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
YPOQ
33364920b3 Fixes crafting stacks without breaking crafted machinery (#31298) 
* Revert "Fixes stacking when crafting items"

* Fixes crafted stacked items properly

* Update stack.dm
 2017-10-05 09:25:08 -05:00
AnturK
f45344ed8c Adds wigs 2017-10-05 09:23:56 -05:00
Jordan Brown
f91dc76e1a Merge pull request #31310 from ShizCalev/lobby-timer-fix 
Fixes lobby timer showing as delayed when it's just waiting for more players
 2017-10-05 09:21:43 -05:00
LetterJay
cf37555c4d Merge pull request #3151 from Citadel-Station-13/upstream-merge-31302 
[MIRROR] Move shuttleRotate into the shuttle module
 2017-10-05 09:13:41 -04:00
LetterJay
40b8365924 Merge pull request #3154 from Citadel-Station-13/upstream-merge-31294 
[MIRROR] Fix abductor scientist being unable to use science tool
 2017-10-05 09:13:06 -04:00
LetterJay
de8803ce6d Merge pull request #3153 from Citadel-Station-13/upstream-merge-31290 
[MIRROR]  Fixes jaunters chasm-saving feature
 2017-10-05 09:12:45 -04:00
LetterJay
a1ae6add27 Merge pull request #3152 from Citadel-Station-13/upstream-merge-31296 
[MIRROR] Cleans up and fixes old landmarks
 2017-10-05 09:12:35 -04:00
LetterJay
805913f107 Merge pull request #3149 from Citadel-Station-13/upstream-merge-31269 
[MIRROR] Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
 2017-10-05 09:12:09 -04:00
LetterJay
929b67a61a Merge pull request #3148 from Citadel-Station-13/upstream-merge-31244 
[MIRROR] Lizzers and plasmamen can now be servants of Ratvar
 2017-10-05 09:11:38 -04:00