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

1833 Commits

Author SHA1 Message Date
CitadelStationBot
57d58163d2 [MIRROR] Overloaded leg actuators now consume at least 100 power per step (#3211) 
* Merge pull request #31389 from Y0SH1M4S73R/patch-1

Overloaded leg actuators now consume at least 100 power per step

* Overloaded leg actuators now consume at least 100 power per step
 2017-10-07 23:04:36 -07:00
LetterJay
f95ba7dfaa Merge pull request #3202 from Citadel-Station-13/upstream-merge-31378 
[MIRROR] Lets cyborgs use ladders
 2017-10-07 23:43:50 -04:00
LetterJay
662a7d55cd Merge pull request #3201 from Citadel-Station-13/upstream-merge-31383 
[MIRROR] Fixes grammar on zippos
 2017-10-07 23:43:35 -04:00
LetterJay
4cc8703a93 Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375 
[MIRROR] Fixes clockcult runtime
 2017-10-07 23:42:57 -04:00
Neri
4bc4ab7fc5 Oh. That's what was missing. (#3143) 
Boop.
 2017-10-07 14:01:43 -07:00
kevinz000
13aa6f8650 Lets cyborgs use ladders (#31378) 2017-10-07 08:40:15 -05:00
Jordan Brown
a8c4a155a5 Merge pull request #31383 from BeeSting12/youlights 
Fixes grammar on zippos
 2017-10-07 08:38:04 -05:00
AnturK
84490f919e Fixes clockcult runtime 2017-10-07 07:46:52 -05:00
LetterJay
0c6be827a2 Merge pull request #3195 from Citadel-Station-13/upstream-merge-31364 
[MIRROR] Fixes Wood Being Invisible.
 2017-10-07 01:08:18 -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
2b42ad5200 Update decal.dm 2017-10-06 22:22:35 -05:00
Kerbin-Fiber
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
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
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
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
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
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
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
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
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
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
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
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
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
29aafaf42d Merge pull request #3140 from Citadel-Station-13/upstream-merge-31286 
[MIRROR] ismachinery define
 2017-10-05 08:32:10 -04:00
LetterJay
b374f2c22d Merge pull request #3139 from Citadel-Station-13/upstream-merge-31287 
[MIRROR] Correctly applies wizard names
 2017-10-05 08:31:56 -04:00
LetterJay
05770366b5 Merge pull request #3122 from Citadel-Station-13/upstream-merge-31273 
[MIRROR] Moves all stack object sprites from items_and_weapons.dmi to their own file
 2017-10-05 06:10:55 -04: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
Ashe Higgs
682269ab63 Lizzers and plasmamen can now be servants of Ratvar (#31244) 
* Removes racial discrimination from Ratvar's servants

* Activates plasma internals; thank you Y0SH1M4S73R!

* Update clock_cult.dm
 2017-10-05 03:01:01 -05:00
LetterJay
c2d8f048f8 Update cult_items.dm 2017-10-04 21:49:46 -05:00
LetterJay
7c4373c1fe Update cult_items.dm 2017-10-04 21:15:11 -05:00
LetterJay
f57929b26c Update book.dm 2017-10-04 21:14:25 -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
39cf9bb7a0 Merge pull request #31286 from KorPhaeron/ismachinery 
ismachinery define
 2017-10-04 19:26:38 -05:00
Leo
dec28eabfc Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 19:26:31 -05:00
deathride58
5692228379 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:41 -04:00
deathride58
5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
LetterJay
13cf0696e0 Merge branch 'master' into upstream-merge-31198 2017-10-04 19:06:42 -04:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887 
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
 2017-10-04 19:06:02 -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