Poojawa
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
Jay
e0b8d28386
donator item
2019-09-30 22:16:27 -05:00
kevinz000 and GitHub
8d9520ee58
Merge pull request #9336 from Thalpy/beakerpH_tweaks
...
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
kevinz000 and GitHub
d7d4e3cbe2
Merge pull request #9349 from Ghommie/Ghommie-cit210
...
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-28 00:22:38 -07:00
Poojawa
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
and Fermi
146219edf9
Merge branch 'master' into beakerpH_tweaks
2019-09-27 11:50:31 +01:00
Thalpy
1bdb66d5de
Okay a few things I just saw
2019-09-27 07:28:02 +01:00
Ghommie
ee8f1022cc
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
2019-09-24 02:02:24 +02:00
and Fermi
8dcf74d5f0
Makes buffers not react with stab agent
2019-09-22 12:02:20 +01:00
Poojawa
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
Ghommie
33c3f0834e
Prevents sofas being wielded and thus transformed into normal chairs.
2019-09-21 20:01:42 +02:00
and Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
and Fermi
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
and Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
kevinz000 and GitHub
af157e85fb
Update living.dm
2019-09-21 01:48:58 -07:00
kevinz000 and GitHub
313956002b
Merge pull request #9269 from Thalpy/FermiGrenades
...
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000 and GitHub
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000 and GitHub
f259d98d7a
Merge pull request #9282 from Ghommie/Ghommie-cit193
...
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
and Fermi
15d36cbaa1
I need to stop leaving .dm files open in dreammaker.
2019-09-21 09:37:54 +01:00
and Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
and Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
and Fermi
a8747449c2
All good
2019-09-20 21:50:04 +01:00
and Fermi
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
and Fermi
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
and Fermi
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
Thalpy and GitHub
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
and Fermi
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
and Fermi
70098f8bc8
Merge branch 'master' into Reagents_bitflats
2019-09-19 20:04:10 +01:00
and Fermi
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
and Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
and Fermi
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
and Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
and Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
and Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
kevinz000 and GitHub
a6f4548349
Merge pull request #9295 from Ghommie/Ghommie-cit196
...
Raising police baton and tele baton cooldown from 0.8 to 1.4 seconds.
2019-09-17 22:03:29 -07:00
and Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
Ghommie
ca95d39a46
Slowing down police baton and tele baton speed.
2019-09-16 17:47:22 +02:00
Ghommie
c813555697
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-09-15 04:05:14 +02:00
Poojawa
bf3d30c0e4
Seperates Insect fluff from wings
...
Fluff can be the new body markings I guess.
2019-09-14 04:27:38 -05:00
Poojawa
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
Poojawa
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
kevinz000 and GitHub
42613d1800
Merge pull request #9251 from Linzolle/chaplain-fashion-time
...
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
kevinz000 and GitHub
63d2273a75
Merge pull request #9220 from Thalpy/Catnip-Furranium
...
Allows Furranium grown from organic sources.
2019-09-13 10:41:07 -07:00
Poojawa
9561819fb7
Fixes Horn coloration issues, allows mammals to choose their meat type
...
Because reasons I guess.
2019-09-13 10:58:04 -05:00
TrilbySpaceClone
ef4b5c1b34
gone_reduced_to_atoms
2019-09-12 23:06:46 -04:00
Ghommie
2226bd3b69
More adjustments.
2019-09-13 00:25:52 +02:00
Poojawa
2bf4d00d29
Double checking my work
2019-09-12 00:46:18 -05:00
Poojawa
94afbbd560
Adding Horn colors, multiple-select legs, and species squash
...
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking. Sprites tweaked on a bunch of critters. Added new wings....
2019-09-11 17:46:17 -05:00
Poojawa