Commit Graph

9513 Commits

Author SHA1 Message Date
kevinz000
eab0b8934f Merge pull request #9279 from Ghommie/Ghommie-cit192
Fixing undergarments color preferences resetting each round.
2019-09-13 10:43:43 -07:00
kevinz000
591a584785 Merge pull request #9275 from Thalpy/InitialD
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
2019-09-13 10:43:22 -07:00
kevinz000
c4f5ce67b8 Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
Adds clip on pokadoted pants, only in 4 types for now
2019-09-13 10:43:00 -07:00
kevinz000
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
4494f42155 Merge pull request #9270 from Linzolle/reallyguys
fixes donuts being uncraftable
2019-09-13 10:40:21 -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
626e525d24 ..? 2019-09-12 23:36:59 -04:00
TrilbySpaceClone
6a36e5a317 huh 2019-09-12 23:26:07 -04:00
TrilbySpaceClone
ef4b5c1b34 gone_reduced_to_atoms 2019-09-12 23:06:46 -04:00
Poojawa
8946d6d059 Update preferences_savefile.dm 2019-09-12 19:02:06 -05:00
Poojawa
4289f4c419 Better way of doing the conversions I think 2019-09-12 19:01:39 -05:00
Ghommie
e987eb27b9 Adjusting a few dozen suits' body coverage. 2019-09-12 23:56:50 +02:00
kevinz000
39b840b180 Merge pull request #9278 from deathride58/fuckkeydown
[s] ports tgstation/tgstation#46425
2019-09-12 12:10:01 -07:00
BlackMajor
7e7527dcfe Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
Poojawa
4a4fe8c03c Adding snowflake to limbgrower 2019-09-12 00:59:28 -05:00
Poojawa
b5a96dc325 Update holidays.dm 2019-09-12 00:53:34 -05:00
Poojawa
7bb8d430e2 Moth week exists I guess 2019-09-12 00:51:15 -05:00
Ghommie
025b6122d4 short colors 2019-09-12 02:58:34 +02:00
Ghommie
e0a29ec001 Fixing undergarments color resetting each round. 2019-09-12 02:48:26 +02:00
deathride58
4551b13547 [s] ports tgstation/tgstation#46425 2019-09-11 19:24:05 -04:00
Poojawa
6dfb22ea47 Update preferences_savefile.dm 2019-09-11 17:58:32 -05:00
Poojawa
0ac3a2307d Update wings.dm 2019-09-11 17:48:57 -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
Fermi
6b76b09449 Missed 2 2019-09-11 23:30:56 +01:00
TrilbySpaceClone
fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00
Fermi
c003352d35 Made it 2.5x 2019-09-11 19:08:57 +01:00
Fermi
db8586950f Made it 3x 2019-09-11 19:07:40 +01:00
Fermi
c79c4aafa5 Cleans up var/test into targetReagent 2019-09-11 18:51:05 +01:00
Fermi
409cbe876a Okay ACTUALLY does what I want it to. 2019-09-11 18:46:32 +01:00
Linzolle
5ab224e20a tweak values 2019-09-11 11:34:27 -05:00
Fermi
d59196f430 oops 2019-09-11 16:38:55 +01:00
Thalpy
f50e84a20c Merge branch 'master' into NeuroFix 2019-09-11 16:24:00 +01:00
Fermi
29a6f12a4e Alligns removal rate to be 2x instead of flat. 2019-09-11 15:00:58 +01:00
Poojawa
f2b343518b Update captain.dm 2019-09-11 02:43:55 -05:00
Poojawa
8988d1e506 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-11 02:41:36 -05:00
Poojawa
c13d8678b8 Update bartender.dm 2019-09-11 02:33:50 -05:00
Poojawa
3e72e13174 double checked 2019-09-11 02:33:32 -05:00
kevinz000
ff0c3ee844 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
The art of drunken captaining
2019-09-10 22:06:36 -07:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
Trilbyspaceclone
a751a73113 Apply suggestions from code review
thx Ceb

Co-Authored-By: cebutris <cebutris2000@gmail.com>
2019-09-10 18:52:49 -04:00
Fermi
6da9f1c64c Indent 2019-09-10 21:51:35 +01:00
kevinz000
829a2615c5 Merge pull request #9247 from Thalpy/QuantFix
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
Tupinambis
6bdc0ef0c0 gives engivend upgraded RCDs by default. 2019-09-09 21:12:28 -05:00
BlackMajor
0b581a1ded Merge branch 'master' into Doggo-sit 2019-09-10 11:02:57 +12:00
Linzolle
6cc92da914 bruh 2019-09-09 18:02:23 -05:00
BlackMajor
c824f4a6fe Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross 2019-09-09 20:38:51 +12:00
Trilbyspaceclone
275457001d It didnt save my last change 2019-09-08 21:52:28 -04:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
nik707
11846849cf Merge pull request #9249 from Trilbyspaceclone/patch-224
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
kevinz000
7843e070ff Update mob.dm 2019-09-08 12:13:24 -07:00