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

939 Commits

Author SHA1 Message Date
LetterJay
3f6596dc17 Merge pull request #3300 from Citadel-Station-13/upstream-merge-31406 
[MIRROR] Adds Slappers
 2017-10-10 22:34:28 -04:00
LetterJay
6e155be9fe Merge pull request #3298 from Citadel-Station-13/upstream-merge-31474 
[MIRROR] Removes some spawns from explosion effects
 2017-10-10 22:34:12 -04:00
LetterJay
822f15f4ae Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494 
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 22:32:52 -04:00
LetterJay
41ef0500ac Merge pull request #3289 from Citadel-Station-13/upstream-merge-31444 
[MIRROR] Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done.
 2017-10-10 22:32:02 -04:00
deathride58
c163176e5d Adds Slappers (#31406) 
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
 2017-10-10 19:54:30 -05:00
MoreRobustThanYou
3e8d51d871 Removes some spawns from explosion effects (#31474) 
* Update effects_explosion.dm

* god damn it

* Update effects_explosion.dm

* Update effects_explosion.dm

* THANK YOU KEVINZ FOR THE WRAPPER

* Update effects_explosion.dm

* Update effects_explosion.dm

* clean my ass
 2017-10-10 15:41:24 -05:00
Jordan Brown
7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
kevinz000
3d4b35d000 Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done. (#31444) 
* Update cigs_lighters.dm

* Update cigs_lighters.dm

* Update cigs_lighters.dm
 2017-10-10 13:19:03 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920) 
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
 2017-10-10 13:13:38 -05:00
LetterJay
f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
AnturK
344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix 
Fixes Shock Collars Getting Stuck In Pockets.
 2017-10-10 02:46:45 -04:00
LetterJay
e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066 
[MIRROR] Refactors virus spreading
 2017-10-10 02:46:04 -04:00
Kevak
fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
LetterJay
95031ae187 Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441 
[MIRROR] Fixes a forceMove(null)
 2017-10-09 23:01:51 -04:00
kevinz000
2456a2a289 Update plastic.dm (#31441) 2017-10-09 14:26:40 -05:00
vuonojenmustaturska
176642ba76 Stops airlocks from getting harddeleted, also fixes an unrelated runtime (#31412) 
* Stops airlocks from getting harddeleted, also fixes an unrelated runtime

Destroying doors with a sniper rifle or anything that flat out destroys them good would runtime in doors.dm #L184.
Also doors would very often not get qdel'd properly, it was not 100% of the time but very common, this *seems* to fix it but since reproducing the bug was never quite certain, I'm not absolutely sure I got it. I did destroy all the doors on the station without triggering a harddel on a door after this fix, where previously it would happen.

* old friend ex_act
 2017-10-09 08:56:16 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay
86edafb132 lol 2017-10-09 01:06:50 -05:00
LetterJay
f6bfbaa192 Merge pull request #3226 from Citadel-Station-13/upstream-merge-31324 
[MIRROR] Minor refactor to storage items
 2017-10-08 16:22:40 -04:00
LetterJay
9cf77a79ba Merge pull request #3221 from Citadel-Station-13/upstream-merge-31262 
[MIRROR] TTV code cleanup
 2017-10-08 16:20:49 -04:00
LetterJay
d84ed9e9ae Merge pull request #3217 from Citadel-Station-13/upstream-merge-31393 
[MIRROR] Fixes wrapper being invisible
 2017-10-08 16:19:55 -04:00
LetterJay
fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388 
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
 2017-10-08 16:19:12 -04:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
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
kevinz000
af077de46c TTV code cleanup (#31262) 
* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm
 2017-10-08 01:04:52 -05:00
LetterJay
cc0e5a1280 Update jetpack.dm 2017-10-07 23:07:25 -05:00
LetterJay
bc2b6b01c1 Update target_stake.dm 2017-10-07 22:50:50 -05:00
LetterJay
a7ac93dd2b Update structures.dm 2017-10-07 22:50:38 -05:00
LetterJay
6332ae6004 Update paiwire.dm 2017-10-07 22:50:21 -05:00
LetterJay
62d2b26c7a Update handcuffs.dm 2017-10-07 22:49:52 -05: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
bawhoppen
0ad78d0c44 frown emoji (#31393) 2017-10-07 19:11:17 -05:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -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
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
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
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