Commit Graph

9869 Commits

Author SHA1 Message Date
Fermi f6b96a818e Update 2019-09-15 00:55:40 +01:00
kevinz000 f3592a54a7 Merge pull request #9288 from Trilbyspaceclone/patch-227
Fixes orical UI being broken and taking modular files that are not a thing
2019-09-14 15:55:43 -07:00
Sishen 5159a58fef Update strained_muscles.dm 2019-09-14 12:00:28 -04:00
Trilbyspaceclone bad8a816ab Update themed.dm 2019-09-14 06:51:19 -04: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 0417c0d6af Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 23:28:08 -05:00
Poojawa 0faafe8deb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded 2019-09-13 23:26:27 -05:00
Poojawa 344ccaf20d cleans up some other species related stuff, unmodularizes some code 2019-09-13 22:18:53 -05:00
Fermi e281384b7a It's actually less laggy than I thought. 2019-09-14 03:10:54 +01:00
Fermi c823a2d23a Preview. 2019-09-14 03:09:32 +01:00
Fermi 80b79ef94e Mostly complete for now 2019-09-14 02:26:06 +01:00
Fermi e62a491c18 Now does chem reactions too. 2019-09-14 00:08:23 +01:00
Fermi 80997e4ef3 Works. 2019-09-13 23:06:09 +01:00
Fermi 04b492924b Works kinda 2019-09-13 20:23:07 +01:00
Fermi 87de05622e Justin case 2019-09-13 19:26:20 +01:00
Fermi eeddcfa295 I think it works, well, not sure about the CR stuff 2019-09-13 19:22:05 +01:00
Trilbyspaceclone 5b2dba354a Merge branch 'master' into fruit 2019-09-13 14:00:11 -04:00
Poojawa f0afc9c490 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-09-13 12:59:15 -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 39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
2019-09-13 10:47:15 -07:00
kevinz000 e107c51e19 Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
2019-09-13 10:46:11 -07:00
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
Fermi 44cff04515 Atom stop crashing pls 2019-09-13 18:03:39 +01: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 c090c98118 final fixes. 2019-09-12 04:11:44 +02: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
Ghommie e8a3612619 dark and default tweaks. 2019-09-12 01:01:26 +02: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
Ghommie cbf041663f Fixing and testing themes. 2019-09-11 23:30:04 +02:00
TrilbySpaceClone fa868ce4ff fashen crime 2019-09-11 14:22:50 -04:00