shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,668 Commits 5 Branches 0 Tags
33be2da9d5927e7a5356d97ff46a809c63a0ec09
Commit Graph

5318 Commits

Author SHA1 Message Date
LetterJay
33be2da9d5 Merge pull request #3544 from Citadel-Station-13/upstream-merge-31927 
[MIRROR] Safeguards GetAllContents and makes it throw a warning
 2017-10-22 12:25:51 -04:00
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
Poojawa
7eb2af06c3 fixes compile 2017-10-21 22:18:19 -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
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
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
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
CitadelStationBot
a7a5679ef9 [MIRROR] Fixes #31897 , cryo base disappearing (#3534) 
* Fixes #31897 , cryo base disappearing (#31909)

* Fixes cryo base disappearing

* code fix instead of icon fix, adds failure feedback to cells

* Fixes #31897 , cryo base disappearing
 2017-10-21 03:46:17 -05:00
CitadelStationBot
ea99c01820 [MIRROR] Fixes simple mob flying corpses (#3521) 
* Fixes simple mob flying corpses (#31794)

* makes simple mobs stop flying when they die

* Update simple_animal.dm

* Fixes simple mob flying corpses
 2017-10-21 03:46:00 -05:00
Poojawa
f993bbb6ee Fixes vore complaints with one weird trick (#3535) 2017-10-21 03:45:17 -05:00
CitadelStationBot
1a94726bdc [MIRROR] Fixes conflicting IDs on ruined whiteship (#3525) 
* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
 2017-10-21 03:44:47 -05:00
CitadelStationBot
0ad6e36727 [MIRROR] Apprentice fixes (#3533) 
* Apprentice fixes (#31880)

* Fixes apprentices summoning for non-wizards

* Fixes admin antaghud not showing for solo wizards

* Apprentice fixes
 2017-10-21 03:44:21 -05:00
CitadelStationBot
fa220bcf9b [MIRROR] Cures cats of their rigor meowrtis (#3530) 
* Merge pull request #31907 from Thunder12345/no_more_rigor_meowrtis

Cures cats of their rigor meowrtis

* Cures cats of their rigor meowrtis
 2017-10-21 03:43:58 -05:00
Jordan Brown
cd74a1333c Blank globals will no longer assign null to themselves 2017-10-21 01:31:23 -05:00
Michiyamenotehifunana
f41c8ccccf Nerfs nerfs 
NO MORE INSTANT BAGGABLE STUNS FROM AUTOLATHES!
 2017-10-21 11:43:41 +08:00
CitadelStationBot
c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523) 
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
 2017-10-20 12:48:15 -05:00
LetterJay
655478e014 Merge pull request #3485 from Citadel-Station-13/upstream-merge-31774 
[MIRROR] reorder carbon destroy to fix ghosting
 2017-10-20 10:32:29 -04:00
CitadelStationBot
f19665e698 [MIRROR] Fixes another stack overflow in pull code (#3515) 
* Merge pull request #31905 from AnturK/anotherloop

Fixes another stack overflow in pull code

* Fixes another stack overflow in pull code
 2017-10-20 01:42:18 -05:00
CitadelStationBot
b044758315 [MIRROR] Fixes a parrot posession runtime (#3516) 
* Fixes a parrot posession runtime (#31879)

* Fixes a parrot posession runtime
 2017-10-20 01:41:28 -05:00
CitadelStationBot
46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJay
bb00cb7075 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 09:01:55 -05:00
LetterJay
b6293e7ece potential IRC fix 2017-10-19 09:01:15 -05:00
LetterJay
72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819 
[MIRROR] Fixes AI visiblity checks
 2017-10-19 09:24:28 -04:00
LetterJay
fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754 
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
 2017-10-19 09:24:04 -04:00