Ghommie
1f2c19c1da
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-20 22:57:06 +02:00
kevinz000
2cf1e6ff85
Merge pull request #9302 from deathride58/jobcodesanitychecks
...
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 22:00:59 -07:00
Ghommie
8bf4d5754e
I'm a moron.
2019-09-18 04:23:52 +02:00
deathride58
18e97451a3
Merge branch 'master' into jobcodesanitychecks
2019-09-17 22:15:09 -04:00
deathride58
d0296a5e81
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 20:15:06 -04:00
Ghommie
150da1d34a
code quality
2019-09-18 01:37:17 +02:00
Ghommie
63fbf225a6
aaaaa
2019-09-18 01:24:44 +02:00
Ghommie
040b6472b4
FUCK
2019-09-18 01:21:18 +02:00
Poojawa
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
BlackMajor
5a58ac6875
Merge pull request #9027 from Poojawa/job-menu-improvements
...
Job menu improvements Except maybe Kevin will merge it this time instead of a month later
2019-09-16 16:19:42 +12: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
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
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
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
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
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
Fermi
d59196f430
oops
2019-09-11 16:38:55 +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
