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

2715 Commits

Author SHA1 Message Date
Jordan Brown
20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings 
Fixes cool threads grammar issue
 2017-10-07 08:42:36 -05:00
LetterJay
233388a345 Merge pull request #3194 from Citadel-Station-13/upstream-merge-31347 
[MIRROR] Makes put_in_hands use drop_location()
 2017-10-07 01:08:10 -04:00
LetterJay
03bd841ac3 Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344 
[MIRROR] Lightgeists are gold core spawnable
 2017-10-07 01:07:03 -04:00
LetterJay
7e547fa2cd Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359 
[MIRROR] Adds Wumborian Fugu to the gold core spawn
 2017-10-07 01:06:46 -04:00
LetterJay
bc91ec435f Merge pull request #3188 from Citadel-Station-13/upstream-merge-31357 
[MIRROR] Resolving tickets now informs the player.
 2017-10-07 01:06:16 -04:00
LetterJay
5988122386 Merge branch 'master' into upstream-merge-31397 2017-10-07 01:05:58 -04:00
LetterJay
dc6d97a69a Merge pull request #3186 from Citadel-Station-13/upstream-merge-31362 
[MIRROR] Fixes deconstructive analyzer infinite material exploit
 2017-10-07 01:05:33 -04:00
LetterJay
fe27aa586c Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336 
[MIRROR] Fixes lighting object initialization on new zlevels.
 2017-10-07 01:05:11 -04:00
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
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
89ab9a0fd7 Update rdconsole.dm 2017-10-06 22:24:24 -05:00
LetterJay
493352f680 Update stationCollision.dm 2017-10-06 22:23:31 -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
Jordan Brown
ebcacc733f Makes put_in_hands use drop_location() (#31347) 2017-10-06 21:36:57 -05:00
Armhulen
a42bf62334 Lightgeists are gold core spawnable (#31344) 
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.

* ez

* honk
 2017-10-06 21:30:23 -05:00
Armhulen
0a3949968d Makes Wumborian Fugu gold core spawnable (#31359) 2017-10-06 21:28:04 -05:00
ExcessiveUseOfCobblestone
f2102c68f1 Resolving tickets now informs the player. (#31357) 
* Update adminhelp.dm

* Update adminhelp.dm
 2017-10-06 21:25:53 -05:00
kevinz000
6a4fb2b26a actually fixes the exploit this time 2017-10-06 20:38:53 -05:00
kevinz000
005cc54bfa Update rdconsole.dm 2017-10-06 20:22:27 -05: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
39d3897b29 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-06 09:39:20 -04:00
Leo
32fa3cf86b Merge pull request #31336 from AnturK/Fixes-lighting-on-away-missions 
Fixes lighting object initialization on new zlevels.
 2017-10-06 07:11:47 -05:00
AnturK
848968834a Fixes outdated away code. 2017-10-06 07:10:36 -05:00
oranges
5a390937ae Fix spelling of conscious 2017-10-06 01:34:33 -05: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