shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,681 Commits 5 Branches 0 Tags
5bce9bc2b054092a3fe1120d49c6da7619180098
Commit Graph
7681 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 5bce9bc2b0 Merge pull request #3514 from Citadel-Station-13/upstream-merge-31904 
[MIRROR] Fixes stack overflow in orbit datum
 2017-10-22 16:39:58 -04:00
CitadelStationBot d2719c03f7 Automatic changelog generation for PR #3492 [ci skip] 2017-10-22 15:39:37 -05:00
LetterJayandGitHub 5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
CitadelStationBot f450abcaab Automatic changelog generation for PR #3546 [ci skip] 2017-10-22 11:26:02 -05:00
LetterJayandGitHub 98f1560e6b Merge pull request #3546 from Citadel-Station-13/upstream-merge-31964 
[MIRROR] Blood Brother now properly sets special role
 2017-10-22 12:26:01 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub d637f7b617 Merge pull request #3537 from Citadel-Station-13/upstream-merge-31951 
[MIRROR] Logs subsystem shutdowns
 2017-10-22 12:20:51 -04:00
LetterJayandGitHub 227e681f28 Merge pull request #3536 from Citadel-Station-13/upstream-merge-31973 
[MIRROR] Fixed projectile runtimes
 2017-10-22 12:19:47 -04:00
LetterJayandGitHub 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
CitadelStationBot 1cc89b55e8 Automatic changelog generation for PR #3529 [ci skip] 2017-10-22 11:18:37 -05:00
LetterJayandGitHub 05e1efd020 Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs 
Nerfs Autolathed Foam Guns
 2017-10-22 12:18:35 -04:00
PoojawaandGitHub 5cb53d91b8 Update game_options.txt 2017-10-21 22:20:09 -05:00
Poojawa 7eb2af06c3 fixes compile 2017-10-21 22:18:19 -05:00
CitadelStationBot 7baf92e738 Blood Brother now properly sets special role 2017-10-21 20:15:49 -05:00
MoreRobustThanYouandCitadelStationBot 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 BrownandCitadelStationBot ff1a3e9f0a Safeguards GetAllContents and makes it throw a warning 2017-10-21 18:56:14 -05:00
CitadelStationBot ede833ef58 Fixes shades being sent back to the arrival shuttle when their stone is qdel'd 2017-10-21 18:53:50 -05:00
Jordan BrownandCitadelStationBot 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
CitadelStationBot 67c0b2aeac It's a time to stop warning about paper bins eating pens 2017-10-21 18:53:43 -05:00
Jordan BrownandCitadelStationBot 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
CitadelStationBot 48da1a2844 Fixes quick_attack_loop stack overflow 2017-10-21 18:52:31 -05:00
Kyle Spier-SwensonandCitadelStationBot e48fb05f06 Fixes quick_attack_loop stack overflow (#31958) 
Fixes quick_attack_loop stack overflow
 2017-10-21 18:52:31 -05:00
CitadelStationBot 418cae24ea Adds sanity check to Narsie pickcultist proc 2017-10-21 18:52:23 -05:00
ShizCalevandCitadelStationBot 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
CitadelStationBot 73d77a4edc Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
AnturKandCitadelStationBot ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
CitadelStationBot 7f08ce5e11 Logs subsystem shutdowns 2017-10-21 13:27:21 -05:00
Jordan BrownandCitadelStationBot 7d9162d608 Logs subsystem shutdowns (#31951) 2017-10-21 13:27:21 -05:00
CitadelStationBotandPoojawa 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
PoojawaandGitHub 1b7d441f7b Update orbit.dm 2017-10-21 07:27:52 -05:00
PoojawaandGitHub 007907940d Update globals.dm 2017-10-21 07:24:50 -05:00
CitadelStationBot d9927cd0b6 Fixed projectile runtimes 2017-10-21 07:19:28 -05:00
CruixandCitadelStationBot d48cea337b Fixed projectile runtimes (#31973) 2017-10-21 07:19:28 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBot d6c26420c9 Automatic changelog generation for PR #3462 [ci skip] 2017-10-21 06:15:52 -05:00
PoojawaandGitHub 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
CitadelStationBotandPoojawa 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 bddb4c1708 Automatic changelog generation for PR #3522 [ci skip] 2017-10-21 06:15:08 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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 e867c4ea25 Automatic changelog generation for PR #3528 [ci skip] 2017-10-21 06:11:05 -05:00
CitadelStationBotandPoojawa 2ac880c5fc [MIRROR] Spraytan Nerf (#3528) 
* Spraytan Nerf

* Spraytan Nerf
 2017-10-21 06:11:04 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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