Commit Graph

20116 Commits

Author SHA1 Message Date
kevinz000
6892e8d01e Merge pull request #8265 from Trilbyspaceclone/patch-103
Reblances goliath stun.
2019-04-22 21:38:33 -07:00
kevinz000
333f758e30 Merge pull request #8105 from Trilbyspaceclone/patch-76
[Ready] Makes transformation slings have a loundess of 2 factor
2019-04-22 21:34:50 -07:00
CitadelStationBot
c0f336f09f Automatic changelog generation for PR #8260 [ci skip] 2019-04-22 23:32:17 -05:00
kevinz000
6be4b7b969 Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
2019-04-22 21:32:15 -07:00
kevinz000
f05b326f15 Merge pull request #8250 from Trilbyspaceclone/patch-100
[Fix] Lowers pda sounds as well as make them respect ringer off
2019-04-22 21:31:38 -07:00
kevinz000
02083e1605 Merge pull request #8273 from Poojawa/screaming
Let's make sure all monsters will attack I guess
2019-04-22 21:22:17 -07:00
Poojawa
fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
Poojawa
b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
Poojawa
df057544f2 Merge branch 'master' into screaming 2019-04-20 23:33:23 -05:00
Poojawa
ae7ce39f62 aaaAAAAaaaa 2019-04-20 23:28:43 -05:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
b35c366516 Merge pull request #8258 from BurgerLUA/VentClogTweak
Rework of Vent Clog Event
2019-04-20 16:36:01 -07:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
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
Trilbyspaceclone
7a3f8704a2 Update goliath.dm 2019-04-20 14:16:30 -04:00
CitadelStationBot
5f2469df5e Automatic changelog generation for PR #8255 [ci skip] 2019-04-19 16:19:16 -05:00
kevinz000
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
kevinz000
5f63cfede7 Merge pull request #8252 from BurgerLUA/WhatHaveIFuckingDone
Tweaks Electric Stimulator + Adds Bonermeter
2019-04-19 14:18:46 -07:00
Trilbyspaceclone
1a680b142f grammar 2019-04-19 14:06:02 -04:00
Trilbyspaceclone
bb51b9e354 grammar 2019-04-19 14:04:03 -04:00
Trilbyspaceclone
e8e7467a50 Update recipes_cake.dm 2019-04-19 13:50:02 -04:00
Trilbyspaceclone
fe5e68710f Update snacks_cake.dm 2019-04-19 13:48:10 -04:00
Trilbyspaceclone
5d4917bf48 Add files via upload 2019-04-19 13:37:56 -04: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
Trilbyspaceclone
ed608ac32c Bhijn... 2019-04-16 20:26:24 -04:00
deathride58
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
Trilbyspaceclone
df880c6723 Update PDA.dm 2019-04-16 16:07:52 -04:00
BurgerLua
d49178fd84 Removed debug code, made the arousal input just be a flat value. 2019-04-16 12:10:03 -07:00
Trilbyspaceclone
1b970e7ce0 Update PDA.dm 2019-04-16 15:08:45 -04:00
Trilbyspaceclone
2b57db57ab Update PDA.dm 2019-04-16 15:07:51 -04:00
BurgerLua
dba2b6deaf Tweaks Electric Stimulator + Adds Bonermeter 2019-04-16 11:55:54 -07:00
Trilbyspaceclone
5c0c8aa4c9 Update PDA.dm 2019-04-15 23:43:36 -04: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
deathride58
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