shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,005 Commits 5 Branches 0 Tags
edce62494de0b0060328aec6763967ead7b43af1
Commit Graph

3845 Commits

Author SHA1 Message Date
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
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
1bcb5f2c86 Update skeletons.dm 2017-10-22 10:48:29 -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
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
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
KorPhaeron
c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -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
e86688be57 Update implant_removal.dm 2017-10-21 07:28:47 -05:00
Poojawa
1b7d441f7b Update orbit.dm 2017-10-21 07:27:52 -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
10c2b8e672 I guess 2017-10-21 07:09:00 -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
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
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
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
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
KorPhaeron
e4f76a79a5 Allows species to be blocked from ever being roundstart, can now choose your Halloween species 2017-10-20 10:11:35 -05:00
LetterJay
c0ddbacd29 Update blob.dm 2017-10-20 09:33:50 -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
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
oranges
7c020af628 Fixes stack overflow in orbit datum 2017-10-19 18:57:05 -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
LetterJay
7fce4c7bcc Merge pull request #3505 from Citadel-Station-13/upstream-merge-31778 
[MIRROR] expand simple_animals/hostile/aistatus into a simple_animals-wide system for putting mobs into idling mode
 2017-10-19 09:23:40 -04:00
LetterJay
bffdbf72fb Merge pull request #3503 from Citadel-Station-13/upstream-merge-31852 
[MIRROR] You will no longer trip on inactive Honkbots. [Tweak]
 2017-10-19 09:22:26 -04:00
LetterJay
9d967c4b09 Merge pull request #3502 from Citadel-Station-13/upstream-merge-31813 
[MIRROR] Cleans up set and adjust procs for disgust and drugginess a bit
 2017-10-19 09:21:23 -04:00
LetterJay
a1643221aa Merge pull request #3498 from Citadel-Station-13/upstream-merge-31751 
[MIRROR] Adds radiation goggles and a small rewrite to make adding more view modes in the future easier
 2017-10-19 09:14:13 -04:00