Commit Graph

20067 Commits

Author SHA1 Message Date
Poojawa
773a94dea6 I really dunno at this point, weh 2019-04-17 06:28:07 -05:00
Poojawa
c65e551c07 makes travis shutup 2019-04-17 06:01:59 -05:00
Poojawa
a0b7c15e0d whatever Travis, it isn't even enabled, fuck off 2019-04-17 04:52:39 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
f244d3fdca system's mostly working
need to polish out the get_blood_dna_list runtime
2019-04-16 11:30:36 -05:00
Poojawa
f58cc09aed Some slight fixes 2019-04-16 08:53:19 -05:00
Poojawa
b3e894dcbb oh god oh fuck oh god it's snowballing 2019-04-16 07:40:37 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
8862d63d0c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-15 14:37:14 -05: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
CitadelStationBot
954b3f638d Automatic changelog generation for PR #8237 [ci skip] 2019-04-15 09:00:40 -05:00
deathride58
aa2eb60b6c Merge pull request #8237 from Poojawa/muzzled-masks
Muzzled masks
2019-04-15 10:00:37 -04:00
deathride58
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
35c3c5c851 greyscale digi shoe blood 2019-04-14 04:58:20 -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
deathride58
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
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
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
CitadelStationBot
dd85f6aac3 Automatic changelog generation for PR #8228 [ci skip] 2019-04-13 02:22:12 -05:00
kevinz000
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
kevinz000
03ae39f95a Merge pull request #8232 from Poojawa/voremobs
Vore capable simple mobs & fixes
2019-04-13 00:21:42 -07:00
kevinz000
a2c75aad76 Merge pull request #8234 from Trilbyspaceclone/patch-98
Removes glycerol from tier 4 dispensers
2019-04-13 00:21:02 -07:00
CitadelStationBot
dcc302908c Automatic changelog generation for PR #8235 [ci skip] 2019-04-13 02:20:43 -05:00
kevinz000
18c6d4e4f1 Merge pull request #8235 from Poojawa/defib-notouch
Buffs defib users by making them stop pulling automatically
2019-04-13 00:20:40 -07:00
CitadelStationBot
d45a58aed9 Automatic changelog generation for PR #8231 [ci skip] 2019-04-13 02:20:07 -05: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
Trilbyspaceclone
690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
Poojawa
3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05:00
Trilbyspaceclone
be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04: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
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
CitadelStationBot
13bb5802a3 Automatic changelog generation for PR #8229 [ci skip] 2019-04-09 18:32:03 -05:00
nik707
059efa6ee4 Merge pull request #8229 from deathride58/fuckpaper
[S] *vzdokh
2019-04-09 18:32:01 -05:00