Trilbyspaceclone
|
1a8a699445
|
Add files via upload
|
2019-04-29 17:44:32 -04:00 |
|
Trilbyspaceclone
|
079dc70dc2
|
Delete food.dmi
|
2019-04-29 17:44:05 -04:00 |
|
kevinz000
|
8b54d33286
|
Merge pull request #8215 from Trilbyspaceclone/Sush
[Ready] Sushi!
|
2019-04-22 21:40:28 -07:00 |
|
kevinz000
|
6be4b7b969
|
Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
|
2019-04-22 21:32:15 -07: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 |
|
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 |
|
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 |
|
Trilbyspaceclone
|
5d4917bf48
|
Add files via upload
|
2019-04-19 13:37:56 -04: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 |
|
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 |
|
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 |
|
deathride58
|
530e021254
|
Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
|
2019-04-15 10:01:45 -04:00 |
|
deathride58
|
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 |
|
Poojawa
|
ba2884d2c7
|
Fixes missing tail wag states
Also sorts the accessories file a bit more again
|
2019-04-13 22:01:55 -05:00 |
|
deathride58
|
a39dd310ba
|
Merge branch 'master' into muzzled-masks
|
2019-04-13 17:48:24 -04:00 |
|
deathride58
|
f6ab8f24e9
|
Merge pull request #8233 from Poojawa/prefwindow-fixes
Pref Window Alignment + cycled backgrounds from Virgo
|
2019-04-13 17:44:50 -04:00 |
|
kevinz000
|
03ae39f95a
|
Merge pull request #8232 from Poojawa/voremobs
Vore capable simple mobs & fixes
|
2019-04-13 00:21:42 -07:00 |
|
kevinz000
|
650b0e6be6
|
Merge pull request #8231 from Poojawa/hypotweaks
Labcoats carry mk II hypos, hypokits hold more
|
2019-04-13 00:20:05 -07:00 |
|
kevinz000
|
a14092e138
|
Merge pull request #8216 from Poojawa/lewd-dna
Adds DNA to semen puddles
|
2019-04-13 00:19:20 -07:00 |
|
kevinz000
|
4bc28596c5
|
Update sprite_accessories.dm
|
2019-04-12 16:06:46 -07:00 |
|
Poojawa
|
c69b0054c8
|
lavaknights are taur capable now
|
2019-04-12 04:38:32 -05:00 |
|
Poojawa
|
fb234783a7
|
muzzle-compatible helmets and masks
|
2019-04-12 04:00:47 -05:00 |
|
Poojawa
|
8520c91a98
|
Pref Window Alignment + cycled backgrounds from Virgo
|
2019-04-11 14:05:40 -05:00 |
|
Poojawa
|
4dcbaa8c80
|
Refractors simple mob vore code, enables vore mobs
also just removes the mistake that was hunger sounds.
|
2019-04-11 11:15:25 -05:00 |
|
Poojawa
|
45b8889562
|
Devourable mobs are digestible again
|
2019-04-11 07:13:19 -05:00 |
|
Poojawa
|
30dbc57e75
|
Labcoats carry mk II hypos, kits hold more
|
2019-04-11 06:55:57 -05:00 |
|
Trilbyspaceclone
|
0b58285b53
|
5 - > 2
|
2019-04-11 00:36:31 -04:00 |
|
Trilbyspaceclone
|
b3e61f02bc
|
brown from green
|
2019-04-11 00:11:18 -04:00 |
|
Poojawa
|
ee15b76397
|
REH half of the helmets done at this point
|
2019-04-10 04:46:45 -05:00 |
|
Poojawa
|
7ffe49c511
|
Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks
|
2019-04-09 22:18:56 -05:00 |
|
Trilbyspaceclone
|
02f8f89a79
|
Update magweapon.dm
|
2019-04-09 09:52:05 -04:00 |
|
Trilbyspaceclone
|
079dd582b8
|
Update magweapon.dm
|
2019-04-09 01:26:32 -04:00 |
|
kevinz000
|
a4a1f77c0f
|
Merge pull request #8220 from Poojawa/master
fixes floaty-leg syndrome for xenos and random color issues
|
2019-04-07 15:13:00 -07:00 |
|
kevinz000
|
a4e01f2118
|
Merge pull request #8214 from Poojawa/loadout-fixes
Loadout items are forced to backpacks, fixes Security Officer Navy uniform
|
2019-04-07 14:49:04 -07:00 |
|
kevinz000
|
b291a927f7
|
Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
|
2019-04-06 19:14:46 -07:00 |
|
Poojawa
|
294349125e
|
fixes floaty-leg syndrome for xenos
also fixes random gen colors from bugging out, idk why it was working just fine before but whatever
|
2019-04-06 16:32:29 -05:00 |
|
Poojawa
|
28373a8ef3
|
lazy tweaks
|
2019-04-06 04:20:44 -05:00 |
|
Poojawa
|
6a26220fea
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks
|
2019-04-06 02:27:58 -05:00 |
|
deathride58
|
6259210a33
|
Merge pull request #8198 from Poojawa/Randomize-tweaks
Species Spawn tweaks and tauric plasmaman suit icons
|
2019-04-05 20:11:59 -04:00 |
|
Poojawa
|
f6988a2a1c
|
Adds DNA to semen puddles
Consistency's sake, I guess.
|
2019-04-05 18:42:22 -05:00 |
|
Poojawa
|
74169ca959
|
Fixes Navy officer uniform re-ports #7515
|
2019-04-05 15:08:04 -05:00 |
|
Trilbyspaceclone
|
a9f99c6072
|
not the correct one
|
2019-04-05 16:05:04 -04:00 |
|
Trilbyspaceclone
|
478c95751d
|
properly
|
2019-04-05 16:04:28 -04:00 |
|
Trilbyspaceclone
|
f07cdc1046
|
Add files via upload
|
2019-04-05 15:35:45 -04:00 |
|
Trilbyspaceclone
|
45499a7b2d
|
Delete food.dmi
|
2019-04-05 15:35:12 -04:00 |
|
Poojawa
|
906efb8b48
|
wah alt and travis restart
|
2019-04-05 05:55:29 -05:00 |
|