shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph

5750 Commits

Author SHA1 Message Date
LetterJay
000f1c89a3 Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935 
[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-22 12:25:42 -04:00
LetterJay
2970c7d66f Merge pull request #3542 from Citadel-Station-13/upstream-merge-31931 
[MIRROR] It's a time to stop warning about paper bins eating pens
 2017-10-22 12:25:33 -04:00
LetterJay
74411b190d Merge pull request #3541 from Citadel-Station-13/upstream-merge-31958 
[MIRROR] Fixes quick_attack_loop stack overflow
 2017-10-22 12:25:18 -04:00
LetterJay
63d0bdd6ee Merge pull request #3540 from Citadel-Station-13/upstream-merge-31937 
[MIRROR] Adds sanity check to Narsie pickcultist proc
 2017-10-22 12:25:10 -04:00
LetterJay
a874d84ba2 Merge pull request #3539 from Citadel-Station-13/upstream-merge-31914 
[MIRROR] Fixes wizard roundend with liches around
 2017-10-22 12:21:00 -04:00
LetterJay
d637f7b617 Merge pull request #3537 from Citadel-Station-13/upstream-merge-31951 
[MIRROR] Logs subsystem shutdowns
 2017-10-22 12:20:51 -04:00
LetterJay
227e681f28 Merge pull request #3536 from Citadel-Station-13/upstream-merge-31973 
[MIRROR] Fixed projectile runtimes
 2017-10-22 12:19:47 -04:00
LetterJay
de45b2fc00 Merge pull request #3531 from Citadel-Station-13/upstream-merge-31882 
[MIRROR] Blank globals will no longer assign null to themselves
 2017-10-22 12:18:48 -04:00
LetterJay
05e1efd020 Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs 
Nerfs Autolathed Foam Guns
 2017-10-22 12:18:35 -04:00
LetterJay
8b4c183a26 Update lightswitch.dm 2017-10-22 10:55:52 -05:00
LetterJay
5d20c88a5c Update false_alarm.dm 2017-10-22 10:55:42 -05:00
LetterJay
513dfc7821 Update transform_procs.dm 2017-10-22 10:51:36 -05:00
LetterJay
03690f9d67 Update blob.dm 2017-10-22 10:51:21 -05:00
LetterJay
529eaa6aca Update player_panel.dm 2017-10-22 10:51:11 -05:00
LetterJay
dadc96ef98 Update overmind.dm 2017-10-22 10:50:58 -05:00
LetterJay
1bcb5f2c86 Update skeletons.dm 2017-10-22 10:48:29 -05:00
LetterJay
b7fa4410ce Update communications.dm 2017-10-22 10:46:32 -05:00
MoreRobustThanYou
26d6e9e67b Gets rids of spawns in airlock code (#31969) 
* Gets rids of spawns in airlock code

* Update airlock.dm
 2017-10-22 00:16:54 -05:00
Firecage
25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
Jordan Brown
faf0e0a10a Adds admin override for false alarm event. 2017-10-22 00:05:23 -05:00
Robustin
04b3a18502 Biosuits now offer high Rad resistance (#31974) 
* Biosuit rad resistance buff

* Buffed medical hardsuit rad resist
 2017-10-21 23:16:18 -05:00
oranges
bc5c548e9b Merge pull request #31989 from ninjanomnom/radiation-borg-fix 
Fixes silicon mob contents becoming contaminated
 2017-10-21 22:22:01 -05:00
Poojawa
7eb2af06c3 fixes compile 2017-10-21 22:18:19 -05:00
MoreRobustThanYou
637273285d Blood Brother now properly sets special role (#31964) 
* Blood Brother now properly sets special role

* Update mob_helpers.dm

* Update mob_helpers.dm

* Update mob_helpers.dm
 2017-10-21 20:15:49 -05:00
Jordan Brown
d0789ecaf9 Splits clothing.dm in 7 other files 2017-10-21 19:01:30 -05:00
Jordan Brown
ff1a3e9f0a Safeguards GetAllContents and makes it throw a warning 2017-10-21 18:56:14 -05:00
Jordan Brown
17d2ff88c5 Merge pull request #31935 from ShizCalev/shade-qdel-fix 
Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-21 18:53:50 -05:00
Jordan Brown
1ee238218c Merge pull request #31931 from vuonojenmustaturska/penfix 
It's a time to stop warning about paper bins eating pens
 2017-10-21 18:53:43 -05:00
Kyle Spier-Swenson
e48fb05f06 Fixes quick_attack_loop stack overflow (#31958) 
Fixes quick_attack_loop stack overflow
 2017-10-21 18:52:31 -05:00
ShizCalev
0a14bf3fd4 Adds sanity check to Narsie pickcultist proc (#31937) 
* Adds sanity check to Narsie pickcultist proc

* claned up src

* cleaned
 2017-10-21 18:52:23 -05:00
AnturK
ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
KorPhaeron
c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -05:00
Jordan Brown
7d9162d608 Logs subsystem shutdowns (#31951) 2017-10-21 13:27:21 -05:00
CitadelStationBot
3e1c307e4e [MIRROR] Adds sports bras (#3354) 
* Adds sports bras

* Update sprite_accessories.dm

* actually add the sprites.
 2017-10-21 07:29:03 -05:00
Poojawa
1b7d441f7b Update orbit.dm 2017-10-21 07:27:52 -05:00
Poojawa
007907940d Update globals.dm 2017-10-21 07:24:50 -05:00
Cruix
d48cea337b Fixed projectile runtimes (#31973) 2017-10-21 07:19:28 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436) 
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
 2017-10-21 07:10:23 -05:00
Poojawa
7b8e88ec7e Medihound Fixes (#3462) 
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
 2017-10-21 06:15:50 -05:00
CitadelStationBot
2dfbdaff30 [MIRROR] fixes being unable to hit people next to you if you're dragging them and moving (#3517) 
* Update projectile.dm (#31893)

* fixes being unable to hit people next to you if you're dragging them and moving
 2017-10-21 06:15:37 -05:00
CitadelStationBot
dd735fb2eb [MIRROR] Makes changelings vomitting acid on things actually leave a puddle of acid (#3522) 
* Changeling vomit (#31878)

* Makes changelings vomitting acid on things actually leave a puddle of acid
 2017-10-21 06:15:06 -05:00
CitadelStationBot
5abe26c765 [MIRROR] fixes gibtonite instant hitting , projectile double hitting - not entirely my fault (#3526) 
* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault (#31891)

* Update projectile.dm

* Update projectile.dm

* Update projectile.dm

* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault
 2017-10-21 06:11:28 -05:00
CitadelStationBot
2ac880c5fc [MIRROR] Spraytan Nerf (#3528) 
* Spraytan Nerf

* Spraytan Nerf
 2017-10-21 06:11:04 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
953a353ce7 [MIRROR] Fixes Poly lying about his age (#2992) 
* Fixes Poly lying about his age

* Update parrot.dm
 2017-10-21 05:54:07 -05:00
CitadelStationBot
35f3c582f2 [MIRROR] Hacky temp workaround of byond bug preventing logging of stack overflow runtimes (#3512) 
* Hacky temp workaround of byond bug preventing logging of stack overflow runtimes (#31900)

* Workaround bug preventing logging of stack overflow runtimes

* I APOLOGIZE FOR NOTHING!

* Hacky temp workaround of byond bug preventing logging of stack overflow runtimes
 2017-10-21 03:47:34 -05:00
CitadelStationBot
d511bc1fde [MIRROR] Fixes bombs on Reebe being an instant win (#3518) 
* Fixes bombs on Reebe being an instant win (#31503)

* Probably reduces Reebe bombcap

* wat

* TTV warning

* Less awkward wording

* Fixes bombs on Reebe being an instant win
 2017-10-21 03:47:07 -05:00
CitadelStationBot
51b87c4921 [MIRROR] switch smoke machine general logging from admin to game log (#3527) 
* switch smoke machine general logging from admin to game log, where it should be -- i missed this when i added the message_admins call

* switch smoke machine general logging from admin to game log
 2017-10-21 03:46:41 -05:00