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

2680 Commits

Author SHA1 Message Date
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
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
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
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
bc2988dc74 Merge pull request #3157 from Citadel-Station-13/upstream-merge-31304 
[MIRROR] Adds wigs
 2017-10-06 02:11:32 -04:00
LetterJay
52c57543cb Update misc_special.dm 2017-10-05 22:43:08 -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
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
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -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
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
b031f0734e Merge pull request #3147 from Citadel-Station-13/upstream-merge-31277 
[MIRROR] Moved admin music volume slider to its own menu
 2017-10-05 09:10:47 -04:00
LetterJay
0dfed4dfb7 Merge pull request #3145 from Citadel-Station-13/upstream-merge-31255 
[MIRROR] Makes shuttle movement a bit smoother and faster
 2017-10-05 08:47:16 -04:00
LetterJay
f418c066c6 Merge pull request #3144 from Citadel-Station-13/upstream-merge-31299 
[MIRROR] Experimental fix for #29663
 2017-10-05 08:45:55 -04:00
LetterJay
ce933f19e0 Merge pull request #3142 from Citadel-Station-13/upstream-merge-31193 
[MIRROR] Makes the pda font a prefernce
 2017-10-05 08:38:19 -04:00
LetterJay
c600fc7846 Merge pull request #3141 from Citadel-Station-13/upstream-merge-31284 
[MIRROR] Code cleanup in snack_meats.dm
 2017-10-05 08:32:28 -04:00
LetterJay
29aafaf42d Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286 
[MIRROR] ismachinery define
 2017-10-05 08:32:10 -04:00
LetterJay
90a66c9944 Merge pull request #3138 from Citadel-Station-13/upstream-merge-31289 
[MIRROR] Makes the energy katana swwwwwwish when drawn
 2017-10-05 08:31:42 -04:00
LetterJay
915e79e59b Merge pull request #3135 from Citadel-Station-13/upstream-merge-31281 
[MIRROR] Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
 2017-10-05 08:31:23 -04:00
LetterJay
3d364f08f2 Update holder.dm 2017-10-05 07:11:14 -05:00
LetterJay
8e1a31c8af Update holder.dm 2017-10-05 06:51:59 -05:00
Leo
ced865f76d Merge pull request #31290 from YPOQ/jaunterfix 
Fixes jaunters chasm-saving feature
 2017-10-05 06:48:42 -05:00
LetterJay
47b72055cd Update shuttle.dm 2017-10-05 05:19:49 -05:00
LetterJay
abeb003465 Update preferences_savefile.dm 2017-10-05 05:18:04 -05:00
LetterJay
f9cd7aa5b3 Merge branch 'master' into upstream-merge-31289 2017-10-05 06:15:44 -04:00
LetterJay
08f3503a81 Update holder.dm 2017-10-05 05:14:27 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
oranges
cedb56af1b Merge pull request #31302 from ninjanomnom/shuttle-rotation 
Move shuttleRotate into the shuttle module
 2017-10-05 03:05:32 -05:00
oranges
574e166951 Merge pull request #31269 from Firecage/doublehardsuitrebalance 
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
 2017-10-05 03:02:11 -05:00
JJRcop
4ecc019353 Moved admin music volume slider to its own menu (#31277) 
* Moved admin music volume slider to its own menu

* Minor fixes to goonchat
 2017-10-05 02:59:52 -05:00
Emmett Gaines
d50c0e10f6 Makes shuttle movement a bit smoother and faster 2017-10-05 02:31:10 -05:00
RandomMarine
fb7a0d7606 Experimental fix for bloom issue (#31299) 2017-10-04 23:25:06 -05:00
LetterJay
e6830cfec3 Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222 
[MIRROR] Ports dash weapons to the dash datum
 2017-10-04 23:01:59 -04:00
LetterJay
d4cd519730 Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276 
[MIRROR] Moves laughter to the emote
 2017-10-04 22:01:49 -04:00
LetterJay
09f6eb6156 Update preferences_savefile.dm 2017-10-04 20:53:42 -05:00
LetterJay
4c38a8b1e2 Update energy_katana.dm 2017-10-04 20:51:37 -05:00
LetterJay
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
Supermichael777
63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
Leo
c873c17478 Merge pull request #31284 from tgstation/Cyberboss-patch-1 
Code cleanup in snack_meats.dm
 2017-10-04 19:27:47 -05:00
Leo
39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
Leo
e5f5b427ba Makes the energy katana swwwwwwish when drawn 2017-10-04 19:25:21 -05:00
oranges
42c59b67b5 Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed 2017-10-04 17:55:39 -05:00
LetterJay
3fdc29ba42 Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283 
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
 2017-10-04 18:45:09 -04:00
LetterJay
9ee8b6298f Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275 
[MIRROR] Adds deconstruction hints to various things
 2017-10-04 18:44:50 -04:00