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

4685 Commits

Author SHA1 Message Date
oranges
bf7f4e6e69 Minor refactor to storage items (#31324) 
They now do not call the on exit storage hook when items are being
deleted, as well as do not bother to reset a bunch of values

we now cache the see contents list for a very small speed boost

the fancy storage specific update icon is moved to the fancy storage
equivalent proc
 2017-10-08 10:06:51 -05:00
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
CitadelStationBot
d1dcfb63f8 [MIRROR] Miscellaneous virus fixes (#3216) 
* Miscellaneous virus fixes (#31391)

* Probably fixes neutering bugs

* Proper targeting for healing

* Fixes itching affecting roboparts

* Miscellaneous virus fixes
 2017-10-07 23:04:26 -07:00
CitadelStationBot
f579a3bf74 [MIRROR] Fix adding bad config entries (#3219) 
* Fixes adding bad config entries (#31390)

* Fix adding bad config entries
 2017-10-07 23:04:14 -07:00
LetterJay
2acc990425 donation items / framework for some 2017-10-07 23:27:25 -05:00
LetterJay
398455917d Merge pull request #3204 from Citadel-Station-13/upstream-merge-31372 
[MIRROR] Fixes cool threads grammar issue
 2017-10-07 23:44:25 -04:00
LetterJay
04846a2f66 Merge pull request #3203 from Citadel-Station-13/upstream-merge-31376 
[MIRROR] Nightmare spawn event
 2017-10-07 23:44:06 -04: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
LetterJay
21f5d993d8 Merge pull request #3197 from Citadel-Station-13/upstream-merge-31337 
[MIRROR] Nerfs shotgun darts
 2017-10-07 23:42:36 -04:00
LetterJay
8fdf275b26 Merge pull request #3193 from Citadel-Station-13/upstream-merge-31309 
[MIRROR] Config option to automatically call the shuttle for high casualties
 2017-10-07 23:42:17 -04:00
Neri
4bc4ab7fc5 Oh. That's what was missing. (#3143) 
Boop.
 2017-10-07 14:01:43 -07:00
Jordan Brown
20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings 
Fixes cool threads grammar issue
 2017-10-07 08:42:36 -05:00
KorPhaeron
39728cc9b3 Nightmare spawn event (#31376) 
* Nightmare Event

* Update nightmare.dm

* Standards
 2017-10-07 08:41:25 -05: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
jughu
466a6806e1 Allows shotgun darts to cause reagent reactions (#31337) 2017-10-07 00:18:04 -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
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
5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -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
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
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
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
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
Jordan Brown
ebcacc733f Makes put_in_hands use drop_location() (#31347) 2017-10-06 21:36:57 -05:00
Jordan Brown
b17a770299 Config option to automatically call the shuttle for high casualties (#31309) 2017-10-06 21:35:49 -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
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