Thalpy
564c1fde9f
Merge branch 'master' into Reagents_bitflats
2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22
Merge pull request #9309 from Thalpy/tg-Organ-port
...
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
2019-10-07 23:29:19 -07:00
nik707
6803338df2
Merge pull request #9384 from jakeramsay007/Moar-Bugfixes
...
Fixes the Trek uniform/suit sprites
2019-10-07 18:19:59 -05:00
Thalpy
27c2c89766
Merge branch 'master' into Reagents_bitflats
2019-10-05 23:43:19 +01:00
kevinz000
356755d710
Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE
...
[SPPEEEEDDDDDMERGE] Fixes buffers not doing stuff because oops
2019-10-05 08:26:40 -07:00
Fermi
2abd15c7e7
Incase someone speedmerges
2019-10-04 04:48:34 +01:00
Fermi
d1c381cad3
lye down
2019-10-04 03:27:30 +01:00
Fermi
10f5fc3b47
Buffer fix
2019-10-04 03:22:53 +01:00
Jay
70cbd8c1ca
fixes bad icon path
2019-10-02 22:11:42 -05:00
Chayse Ramsay
68ca8a5ac0
whoops
2019-10-02 11:55:38 +01:00
Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
Jay
e0b8d28386
donator item
2019-09-30 22:16:27 -05:00
Thalpy
1bdb66d5de
Okay a few things I just saw
2019-09-27 07:28:02 +01:00
Fermi
8dcf74d5f0
Makes buffers not react with stab agent
2019-09-22 12:02:20 +01:00
Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
Fermi
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
kevinz000
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
3e899e59f9
Merge pull request #9283 from Trilbyspaceclone/removal
...
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000
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
Fermi
15d36cbaa1
I need to stop leaving .dm files open in dreammaker.
2019-09-21 09:37:54 +01:00
Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
Fermi
a8747449c2
All good
2019-09-20 21:50:04 +01:00
Fermi
d12fd72ebf
Updates a buncha stuff.
2019-09-20 21:11:20 +01:00
Fermi
9b2f67d67d
reagent_flags is used elsewhere, renamed to chemical_flags
2019-09-20 19:43:37 +01:00
Fermi
3f2933adbf
Ghommies' requests.
2019-09-19 23:31:36 +01:00
Thalpy
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
Fermi
b8190552f1
Update defines, and vars, and created new procs
2019-09-19 21:24:50 +01:00
Fermi
70098f8bc8
Merge branch 'master' into Reagents_bitflats
2019-09-19 20:04:10 +01:00
Fermi
7ef5ab0332
TO TEST - also needs #9099 merging.
2019-09-19 17:52:45 +01:00
Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
Fermi
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -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
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
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
Thalpy
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
Fermi
4f0afb6e45
50 to 100
2019-09-10 21:36:49 +01:00
Fermi
0a4090d83c
Fixes weird message
2019-09-10 21:12:43 +01:00
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
Fermi
033057d380
OOPS
2019-09-08 02:55:40 +01:00
BlackMajor
fbc2d3c8fe
Ports dogborg sprites from RP to main
...
Includes sit sprites, rest style verb, changing where sit sprites update in robot update_icons so that eye layers get cut properly when resting, etc.
2019-09-06 01:23:53 +12:00
