shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,769 Commits 5 Branches 0 Tags
ad69aa5b8df78cabdd1981b03b0bce33898c670f
Commit Graph
4796 Commits
Author SHA1 Message Date
Kerbin-FiberandCitadelStationBot 19ff9a0f75 Fixes Wood Being Invisible. (#31364) 
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
 2017-10-06 21:46:15 -05:00
Jordan BrownandCitadelStationBot ebcacc733f Makes put_in_hands use drop_location() (#31347) 2017-10-06 21:36:57 -05:00
Jordan BrownandCitadelStationBot b17a770299 Config option to automatically call the shuttle for high casualties (#31309) 2017-10-06 21:35:49 -05:00
ArmhulenandCitadelStationBot 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
ArmhulenandCitadelStationBot 0a3949968d Makes Wumborian Fugu gold core spawnable (#31359) 2017-10-06 21:28:04 -05:00
ExcessiveUseOfCobblestoneandCitadelStationBot f2102c68f1 Resolving tickets now informs the player. (#31357) 
* Update adminhelp.dm

* Update adminhelp.dm
 2017-10-06 21:25:53 -05:00
kevinz000andCitadelStationBot 6a4fb2b26a actually fixes the exploit this time 2017-10-06 20:38:53 -05:00
kevinz000andCitadelStationBot 005cc54bfa Update rdconsole.dm 2017-10-06 20:22: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
WewLadsandkevinz000 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
LeoandCitadelStationBot 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
AnturKandCitadelStationBot 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
XhuisandCitadelStationBot 97e5c9b590 Fixes runed metal and brass sprites 2017-10-06 03:19:23 -05:00
ShizCalevandCitadelStationBot 0dc8bd5d83 Sets turf decal layer 2017-10-06 03:12:07 -05:00
orangesandCitadelStationBot 5a390937ae Fix spelling of conscious 2017-10-06 01:34:33 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub bc2988dc74 Merge pull request #3157 from Citadel-Station-13/upstream-merge-31304 
[MIRROR] Adds wigs
 2017-10-06 02:11:32 -04:00
LetterJayandGitHub d50c1034b9 Update type2type.dm 2017-10-05 22:44:50 -05:00
LetterJayandGitHub 52c57543cb Update misc_special.dm 2017-10-05 22:43:08 -05:00
Joan LungandCitadelStationBot 4d06415a4b Makes Ocular Wardens effective again (#31325) 
* Makes Ocular Wardens effective again

* get that, too
 2017-10-05 19:22:29 -05:00
ShizCalevandCitadelStationBot 20c5749416 Cleans up leftover Hand of God gamemode references 2017-10-05 18:17:21 -05:00
vuonojenmustaturskaandCitadelStationBot 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-PepeandCitadelStationBot 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
orangesandCitadelStationBot 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 BrownandCitadelStationBot b3243d5900 Removes old ass belt.dm (#31317) 2017-10-05 15:31:56 -05:00
RobustinandCitadelStationBot 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 LungandCitadelStationBot 2a75083f80 Makes angle2dir() much more accurate 2017-10-05 15:05:13 -05:00
XDTMandCitadelStationBot 5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
YPOQandCitadelStationBot 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
AnturKandCitadelStationBot f45344ed8c Adds wigs 2017-10-05 09:23:56 -05:00
Jordan BrownandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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