Commit Graph
20092 Commits
Author SHA1 Message Date
Poojawa 55c85175e7 I can english to potatoe 2019-04-29 02:41:15 -05:00
Poojawa 29af85a0ae Brings NTPR to the nice discord bot 2019-04-29 02:37:01 -05:00
kevinz000andGitHub f38546b21a Merge pull request #8230 from Trilbyspaceclone/patch-97
[Ready] Makes Mentor chat have better colors as not to confuse Mentors from chat vs helping
2019-04-20 16:40:09 -07:00
CitadelStationBot 65d219ac40 Automatic changelog generation for PR #8182 [ci skip] 2019-04-20 18:38:22 -05:00
kevinz000andGitHub 939bbbe3e7 Merge pull request #8182 from deathride58/optimizeshearersinview
Optimizes get_hearers_in_view by caching the results of view() in the proc
2019-04-20 16:38:20 -07:00
kevinz000andGitHub 8c5db62542 Merge pull request #8244 from Poojawa/iv-dripper-punctures
Adds a can_inject check to IV Drips
2019-04-20 16:37:13 -07:00
kevinz000andGitHub d4636ddeb8 Merge pull request #8249 from Poojawa/mask-checkers
Headgear is more aggressive in setting normal style stuff
2019-04-20 16:36:26 -07:00
CitadelStationBot cd3edb22d0 Automatic changelog generation for PR #8258 [ci skip] 2019-04-20 18:36:03 -05:00
kevinz000andGitHub b35c366516 Merge pull request #8258 from BurgerLUA/VentClogTweak
Rework of Vent Clog Event
2019-04-20 16:36:01 -07:00
kevinz000andGitHub e521a5abd6 Merge pull request #8217 from Trilbyspaceclone/patch-95
[Ready] Makes alien alloy be able to unlock - Alien Alloy.
2019-04-20 16:33:51 -07:00
kevinz000andGitHub 901e748675 Merge pull request #8254 from Poojawa/the-great-vore-escape
clears blindness on vore OOC escape
2019-04-20 16:31:59 -07:00
kevinz000andGitHub 60bc278418 Merge pull request #8227 from Trilbyspaceclone/patch-96
Magrifle/Magpistol nonlethals now do 2 damage rather than 0
2019-04-20 16:30:58 -07:00
CitadelStationBot 8e2353c058 Automatic changelog generation for PR #8259 [ci skip] 2019-04-20 18:29:37 -05:00
kevinz000andGitHub 6291185422 Merge pull request #8259 from deathride58/fuckpaicircuits
Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits
2019-04-20 16:29:35 -07:00
CitadelStationBot 5f2469df5e Automatic changelog generation for PR #8255 [ci skip] 2019-04-19 16:19:16 -05:00
kevinz000andGitHub c1c198f423 Merge pull request #8255 from BurgerLUA/LoadoutUITweaks
Improved the layout of the Loadout UI to be more fitting
2019-04-19 14:19:14 -07:00
CitadelStationBot cc7b5b524b Automatic changelog generation for PR #8252 [ci skip] 2019-04-19 16:18:49 -05:00
kevinz000andGitHub 5f63cfede7 Merge pull request #8252 from BurgerLUA/WhatHaveIFuckingDone
Tweaks Electric Stimulator + Adds Bonermeter
2019-04-19 14:18:46 -07:00
deathride58 8f021d4143 Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits 2019-04-18 21:44:43 -04:00
BurgerLua 97fb78d07e Reworked the Vent Clog event to shoot out smoke instead of foam; also made the foam shoot out one at a time over a long period of time to prevent lag. 2019-04-18 18:00:19 -07:00
BurgerLua 0f838e3e2b Improved the layout of the Loadout UI to be more fitting 2019-04-16 23:37:48 -07:00
Poojawa 1f65b1ebdd clears blindness on vore OOC escape 2019-04-17 01:27:08 -05:00
BurgerLua 7ff2b6817b No more seperate whatever 2019-04-16 21:06:57 -07:00
Poojawa 795558ee99 Fixes missing EVA helmet states 2019-04-16 21:57:05 -05:00
fdd0eb4b17 Update modular_citadel/code/modules/integrated_electronics/subtypes/manipulation.dm
Co-Authored-By: BurgerLUA <BurgerLUA@users.noreply.github.com>
2019-04-16 15:40:55 -07:00
BurgerLua d49178fd84 Removed debug code, made the arousal input just be a flat value. 2019-04-16 12:10:03 -07:00
BurgerLua dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter 2019-04-16 11:55:54 -07:00
Poojawa 499078fb10 Headgear is more aggressive in setting normal style stuff
I swear byond's gotten a lot more dumb about if statements...
2019-04-15 22:04:37 -05:00
deathride58andGitHub 05acb8c7a9 Merge pull request #8245 from Poojawa/npc-fix
rectifies aggressive mobs being Bethesda T-pose aggressive
2019-04-15 21:31:56 -04:00
Poojawa 12d17f6f52 usr 2019-04-15 11:28:42 -05:00
Poojawa 8b6d0d0604 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into iv-dripper-punctures 2019-04-15 10:10:05 -05:00
Poojawa 838373cbba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into npc-fix 2019-04-15 10:09:08 -05:00
deathride58andGitHub 530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
2019-04-15 10:01:45 -04:00
deathride58andGitHub c6ef9da679 Merge pull request #8239 from Citadel-Station-13/kevinz000-patch-36
Virgo hairs are now sorted better
2019-04-15 10:01:13 -04:00
CitadelStationBot 954b3f638d Automatic changelog generation for PR #8237 [ci skip] 2019-04-15 09:00:40 -05:00
deathride58andGitHub aa2eb60b6c Merge pull request #8237 from Poojawa/muzzled-masks
Muzzled masks
2019-04-15 10:00:37 -04:00
deathride58andGitHub 13e3c02e8f Merge pull request #8241 from Poojawa/travis-repairs
Travis repairs and tool folder sync from TG
2019-04-15 09:33:09 -04:00
Poojawa 295918d77c siiigh. tg NPC code is so bad 2019-04-15 08:10:31 -05:00
Poojawa 25d77bac91 Adds a can_inject check to IV Drips
Syringes and hyposprays check, so too do IV needles.
2019-04-15 01:01:16 -05:00
Poojawa e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa 29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Poojawa 0ae08594a0 These are actually, all 100% unneeded 2019-04-13 23:13:37 -05:00
Poojawa bc619ae7d9 Tool folder and backend TG sync 2019-04-13 22:56:51 -05:00
Poojawa ba2884d2c7 Fixes missing tail wag states
Also sorts the accessories file a bit more again
2019-04-13 22:01:55 -05:00
deathride58andGitHub a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
CitadelStationBot df40dcf553 Automatic changelog generation for PR #8233 [ci skip] 2019-04-13 16:44:52 -05:00
deathride58andGitHub f6ab8f24e9 Merge pull request #8233 from Poojawa/prefwindow-fixes
Pref Window Alignment + cycled backgrounds from Virgo
2019-04-13 17:44:50 -04:00
CitadelStationBot dd85f6aac3 Automatic changelog generation for PR #8228 [ci skip] 2019-04-13 02:22:12 -05:00
kevinz000andGitHub 637b92a88a Merge pull request #8228 from Coolgat3/ripley
Making the Ripley mech not useless (More info inside)
2019-04-13 00:22:10 -07:00
CitadelStationBot 3f93a5e022 Automatic changelog generation for PR #8232 [ci skip] 2019-04-13 02:21:44 -05:00