shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,145 Commits 5 Branches 0 Tags
2ca217388f5547ce39e62b979eeff45758e9ef62
Commit Graph

9568 Commits

Author SHA1 Message Date
LetterJay
2ca217388f Merge pull request #6165 from Citadel-Station-13/upstream-merge-36748 
[MIRROR] Tweaks stats of 4 virus symptoms
 2018-03-31 06:20:54 -05:00
LetterJay
15cb1258dc Merge pull request #6163 from Citadel-Station-13/upstream-merge-36457 
[MIRROR] Fixes phobia word recognition
 2018-03-31 06:20:33 -05:00
LetterJay
c3ddcb9da7 Merge pull request #6162 from Citadel-Station-13/upstream-merge-36628 
[MIRROR] Fixes "ocular wardens don't target buckled mobs"
 2018-03-31 06:20:12 -05:00
LetterJay
48bfd57b0f Merge pull request #6161 from Citadel-Station-13/upstream-merge-36714 
[MIRROR] Fixes strobe shields' icon getting stuck
 2018-03-31 06:19:55 -05:00
LetterJay
7ce6bc2a62 Merge pull request #6160 from Citadel-Station-13/upstream-merge-36703 
[MIRROR] Restarting the controller no longer resets the config
 2018-03-31 06:19:35 -05:00
LetterJay
2d4218d6c6 Merge pull request #6159 from Citadel-Station-13/upstream-merge-36610 
[MIRROR] Little fix to RPED
 2018-03-31 06:19:19 -05:00
LetterJay
a40df26aed Merge pull request #6158 from Citadel-Station-13/upstream-merge-36765 
[MIRROR] Fixes the cargo Express Console's description [wtf why is there a sprites tag]
 2018-03-31 06:19:05 -05:00
LetterJay
e35ddc7093 Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723 
[MIRROR] Corrects plasma window armor inconsistency
 2018-03-31 06:18:48 -05:00
LetterJay
018fa05f01 Merge pull request #6155 from Citadel-Station-13/upstream-merge-36554 
[MIRROR] Adds config to allow ranks only from txt
 2018-03-31 06:17:58 -05:00
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477 
[MIRROR] Science goggles detect grenade reagents
 2018-03-31 06:17:37 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655 
[MIRROR] Fixes hot potato coloration
 2018-03-31 06:17:22 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617 
[MIRROR] Improves some logging legibility
 2018-03-31 06:17:11 -05:00
LetterJay
694f3a6949 Merge pull request #6149 from Citadel-Station-13/upstream-merge-36636 
[MIRROR] Fixes prosthetic limbs injury messages
 2018-03-31 06:16:48 -05:00
LetterJay
dcaf3e2575 Merge pull request #6148 from Citadel-Station-13/upstream-merge-36750 
[MIRROR] spelling error fixed.
 2018-03-31 06:16:00 -05:00
LetterJay
e6345d05bc Merge pull request #6146 from Citadel-Station-13/upstream-merge-36736 
[MIRROR] Assemblies with lighting circuits now properly update light position.
 2018-03-31 06:15:34 -05:00
LetterJay
437301bf21 Merge pull request #6144 from Citadel-Station-13/upstream-merge-36609 
[MIRROR] Night vision goggles no longer cancel out thermal eyes
 2018-03-31 06:15:19 -05:00
LetterJay
acc54fedb0 Merge pull request #6142 from Citadel-Station-13/upstream-merge-36667 
[MIRROR] Gas react is much more efficient
 2018-03-31 06:15:05 -05:00
LetterJay
fcb2dc821e Merge pull request #6141 from Citadel-Station-13/upstream-merge-36747 
[MIRROR] Increases monkeycap to 64
 2018-03-31 06:14:34 -05:00
LetterJay
0c076ef013 Merge pull request #6137 from Citadel-Station-13/upstream-merge-36700 
[MIRROR] Makes chem dispenser recharging far less glacial
 2018-03-31 06:13:35 -05:00
LetterJay
2e552042c5 Merge pull request #6136 from Citadel-Station-13/upstream-merge-36752 
[MIRROR] Adds an admin follow link to revenant spawns
 2018-03-31 06:13:22 -05:00
LetterJay
3db8277ccd Merge pull request #6135 from Citadel-Station-13/upstream-merge-36426 
[MIRROR] Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety
 2018-03-31 06:13:10 -05:00
LetterJay
cb4aa936db Update ai.dm 2018-03-29 18:32:24 -07:00
LetterJay
002c5a2b73 ai icon 2018-03-29 18:32:24 -07:00
kevinz000
dc4b52bcfd logging (#36818) 2018-03-29 18:31:31 -07:00
CitadelStationBot
de282f5201 [MIRROR] individual player panel now logs 100% of the time (#6176) 
* individual player panel now logs 100% of the time

* logging (#36819)
 2018-03-29 17:10:37 -07:00
Alomga
6b48740f7e Tweaks stats of 4 virus symptoms (#36748) 
Makes Vitiligo, Revitiligo, Facial Hypertrichosis and Alopecia usefull instead of making your virus worse without contributing anything. Symptom that makes you pale shouldn't have worse stats that one that can kill.
 2018-03-28 19:21:05 -05:00
Tacolizard
8b1cf5bfce Fixes phobia word recognition (#36457) 
* fix

* Update phobia.json

* add plural detection
 2018-03-28 13:43:09 -05:00
Davidj361
60091c50b5 Fixes "ocular wardens don't target buckled mobs" (#36628) 
* Ocular wardens now shoot handcuffed and buckled, but not if they're spelled handcuffed.

* Clock cultists can spell cuff sec cuffed carbon mobs, so the ocular doesn't shoot them.

* Added in review suggestions

* More oversight
 2018-03-28 13:42:59 -05:00
XDTM
75187908a3 Fixes strobe shields' icon getting stuck (#36714) 
* Fixes strobe shields' icon getting stuck

* src instead of get_turf(src)
 2018-03-28 13:42:48 -05:00
Jordan Brown
7980b080e3 Restarting the controller no longer resets the config 2018-03-28 13:40:31 -05:00
Jalleo
8ff1fdd907 Little fix to RPED (#36610) 
* Why use a weird proc to check it than set a static list? Yes one is technically more expensive but better maintainability

* Changes to what Cyberboss suggested (For performance reasons?)

* oranges and Antur make sense with the && False its just a false return instead.

* Man I need to read more areas of the codebase that entire proc being modified was not required with my list change......
 2018-03-28 13:39:18 -05:00
MrDoomBringer
efb3dceb32 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765) 
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
 2018-03-28 13:38:04 -05:00
RandomMarine
d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -05:00
Jordan Brown
4629039c38 Adds config to allow ranks only from txt 2018-03-28 13:01:41 -05:00
yorii
130337797d Science goggles detect grenade reagents (#36477) 
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
 2018-03-28 12:18:18 -05:00
kevinz000
8c98e4769c Fixes hot potato coloration (#36655) 
* Fixes hot potato coloration

* wupps
 2018-03-28 12:17:45 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup 
Improves some logging legibility
 2018-03-28 12:17:32 -05:00
vuonojenmustaturska
888ca609a8 Merge pull request #36636 from ShizCalev/robo-limb-shake-message 
Fixes prosthetic limbs injury messages
 2018-03-28 12:17:23 -05:00
BeeSting12
cb8f3e9293 >happend 2018-03-28 12:17:14 -05:00
vuonojenmustaturska
7020c19dff Merge pull request #36736 from fludd12/light-up-the-night 
Assemblies with lighting circuits now properly update light position.
 2018-03-28 12:16:56 -05:00
iksyp
c0e45aa0a8 Night vision goggles no longer cancel out thermal eyes (#36609) 
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
 2018-03-28 12:16:38 -05:00
Robustin
ff3818aa86 Gas react is much more efficient (#36667) 
* React but with some conditions first

* Update gas_types.dm

* Webeditor maymay

* This might break fire but isn't that what freezes are for?

* More webeditor memes

* Did that madman just make it even FASTER?

* Changing list to typecache

* Gotta go faster

* review, dnm yet

* gas.len instead of volume

* Dunc the redeemed

* Merge ready

* Dunc's method actually wasnt the best
 2018-03-28 12:16:15 -05:00
vuonojenmustaturska
6bcd278bb6 Merge pull request #36747 from praisenarsie/patch-36 
Increases monkeycap to 64
 2018-03-28 12:16:06 -05:00
vuonojenmustaturska
0a63f55771 Makes chem dispenser recharging far less glacial (#36700) 
* meme

* Makes chem dispenser recharging far less glacial

* Update chem_dispenser.dm
 2018-03-28 12:15:24 -05:00
vuonojenmustaturska
c98ce25dfb adds an admin follow link to revenant spawns 2018-03-28 12:15:15 -05:00
Ashe Higgs
8ec16df2e4 Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426) 
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
 2018-03-28 12:15:06 -05:00
deathride58
d351caf92f Merge pull request #6130 from Citadel-Station-13/upstream-merge-36663 
[MIRROR] Slimepeople now transfer traits on body-swap, and traits now transfer correctly
 2018-03-27 17:51:35 +00:00
deathride58
e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597 
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
 2018-03-27 17:51:17 +00:00
deathride58
c3328968a1 Merge pull request #6128 from Citadel-Station-13/upstream-merge-36622 
[MIRROR] Fixes wormhole projectors
 2018-03-27 17:51:00 +00:00
deathride58
6bbe0d4150 Merge pull request #6126 from Citadel-Station-13/upstream-merge-36715 
[MIRROR] Replaces sniper bullets ex_act with bonus obj damage
 2018-03-27 17:49:53 +00:00