Commit Graph

12533 Commits

Author SHA1 Message Date
Trilbyspaceclone
e7bac925dc Update core.dm 2019-04-15 15:05:11 -04:00
Poojawa
f767069dc2 Custom Species names 2019-04-15 13:50:21 -05: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
deathride58
530e021254 Merge pull request #8240 from Poojawa/human-taaaaaaaails
Fixes missing tail wag states
2019-04-15 10:01:45 -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
Trilbyspaceclone
3a67385bde Update resource.dm 2019-04-14 17:41:54 -04:00
Trilbyspaceclone
85ab924d72 Update core.dm 2019-04-14 17:41:15 -04:00
Trilbyspaceclone
6674aae78c Update factory.dm 2019-04-14 17:40:11 -04:00
Trilbyspaceclone
3c3399ea50 Update shield.dm 2019-04-14 17:37:26 -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
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
Trilbyspaceclone
8fec3e3d1c fixed more grammar 2019-04-08 15:32:23 -04:00
Trilbyspaceclone
bff53530f4 tastes 2019-04-08 02:49:48 -04:00
Trilbyspaceclone
d9d2f4de7a grammar and balance 2019-04-08 02:46:39 -04:00
Trilbyspaceclone
f315250fc4 Update drinnerware.dm 2019-04-08 02:39:37 -04:00
Trilbyspaceclone
7f526242c3 grammar and lowering of Well made 5 -> 2 2019-04-08 02:39:17 -04:00
Trilbyspaceclone
e615038836 Update snacks_other.dm
Traditionally, an onigiri is filled with pickled salted salmon, katsuobushi, kombu, tarako, or any other salty or sour ingredient as a natural preservative.
2019-04-08 02:35:27 -04:00
Trilbyspaceclone
7d3b71938f grammar and "Bitsize fix" 2019-04-08 02:25:22 -04:00
Trilbyspaceclone
4772f12d54 Update drinnerware.dm 2019-04-07 19:52:48 -04:00
Trilbyspaceclone
47e0f5b946 Update recipes_misc.dm 2019-04-07 19:50:52 -04:00
Trilbyspaceclone
b4b9e57058 Update recipes_meat.dm 2019-04-07 19:50:09 -04:00
Poojawa
e6ea9f8ae7 Let's make sure these don't get overriden either because wtf 2019-04-07 18:44:41 -05:00
Trilbyspaceclone
d7b37fcf83 reblance 2019-04-07 19:43:59 -04:00
Trilbyspaceclone
4bb465a7d8 reblance 2019-04-07 19:42:27 -04: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
izzyinbox
0e6b1bdc2f adds TGS command for adding ckeys to the panic bunker bypass 2019-04-07 01:45:47 -05:00