Commit Graph

12451 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
7ffe49c511 Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks 2019-04-09 22:18:56 -05:00
deathride58
69ba76f16f *vzdokh 2019-04-09 19:12:59 -04:00
Cyprian
5434c20781 Changing the ripley 2019-04-09 17:09:07 +02:00
Poojawa
e6ea9f8ae7 Let's make sure these don't get overriden either because wtf 2019-04-07 18:44:41 -05:00
Poojawa
a90ccc89e4 Fixes human tails and ears defaulting to none in save files 2019-04-07 18:29:52 -05:00
kevinz000
8eb8cafa2a Merge pull request #8195 from deathride58/clickdragitems
Adds the ability to quickly use an unequipped item on something by click-dragging it with an empty hand
2019-04-07 15:13:16 -07: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
b57214dfdc Merge pull request #8190 from deathride58/removeomega
Remove kebab's omegastation's job changes
2019-04-07 14:49:58 -07:00
kevinz000
1c297c186e Merge pull request #8219 from Coolgat3/berets
Berettide!
2019-04-07 14:49:24 -07:00
Poojawa
03a174d21f compile fixes except we're memes still
why yes, I'm making the bloods all subtypes of each other at this point. I should probably change the way stuff is colored. but, meh. effort.
2019-04-07 08:54:05 -05:00
izzyinbox
0e6b1bdc2f adds TGS command for adding ckeys to the panic bunker bypass 2019-04-07 01:45:47 -05:00
kevinz000
26c68e70d1 Merge pull request #8158 from Trilbyspaceclone/patch-86
Makes Suit miner vouchers buyable and a Miner replacement bag
2019-04-06 19:17:01 -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
kevinz000
2ad8348a55 Merge pull request #8189 from deathride58/widescreenactionbuttons
Makes action buttons fill the entire screen on widescreen and other weird view sizes
2019-04-06 19:13:30 -07:00
kevinz000
18ccc7d1f0 Merge pull request #8208 from Trilbyspaceclone/patch-93
Local cat forgets to add the same word twice braking a quirk - The fixing
2019-04-06 19:13:06 -07:00
kevinz000
90c86574d3 Merge pull request #8212 from CameronWoof/responsibility
Comments out hunger noises until an intermediate coder adds a preference for it
2019-04-06 19:12:49 -07:00
kevinz000
217e0f1f90 Merge pull request #8210 from Trilbyspaceclone/patch-94
Maybe adds in three new hotkeys!
2019-04-06 19:12:13 -07:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Poojawa
3af678fc23 somehow didn't save? even after a compile check? Nanithefuck 2019-04-06 17:09:43 -05:00
Cyprian
81fde9c7a6 Forgot to add the CE beret to the CE locker. 2019-04-06 23:34:10 +02: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
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02: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
70ace01312 Merge pull request #8211 from Poojawa/hypo-belts
Medical belt overlays + hypo storage
2019-04-05 20:13:55 -04: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