b860c6e0bb
Merge branch 'master' into cargocleanupv2boogaloo
2019-12-06 01:14:44 -05:00
83b77650a8
Additional Cleanup
...
Reorganised Materials, added Bulk Cotton Crate
Removed Wooden Barrel / Toner Crates
Modified Fruit Delux Crate
Modified Cargo Supplies Crate
Moved several crates to their proper areas.
2019-12-06 01:13:54 -05:00
6e7bceb993
Merge pull request #10039 from Putnam3145/traitor-fix
...
makes traitor antag datum and descendents removable by admins
2019-12-03 19:15:19 -07:00
4e2c72f2ed
makes traitor removable
2019-12-03 16:58:32 -08:00
a33dba803e
Merge pull request #9992 from Ghommie/Ghommie-cit411
...
Fixes ai displays status being reset to "Neutral" on login, regardless of choice.
2019-12-03 01:36:02 +00:00
00acb5749f
Merge pull request #9988 from Ghommie/Ghommie-cit409
...
Fixes ED-209 being unbuildable past the welding step.
2019-12-03 01:31:40 +00:00
c31ca96e87
Rebalanced Meat Crate
2019-12-02 16:21:48 -05:00
8d09f5a082
Merge branch 'master' into tinytweaks
2019-12-01 23:24:56 -08:00
8da17c5aaf
Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
...
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
2019-12-01 23:12:35 -08:00
7bb2b042ee
Merge pull request #9989 from Ghommie/Ghommie-cit410
...
Ports the energy gun empty state overlay fix.
2019-12-01 23:06:40 -08:00
4942002698
Merge pull request #10022 from Sishen1542/n
...
techfabs are now easier to investigate
2019-12-01 13:44:00 -08:00
a4323b2e4e
Update _production.dm
2019-12-01 05:10:30 -07:00
3ac863d0ac
Revert "n"
...
This reverts commit 975a1a968c
2019-12-01 05:09:34 -07:00
975a1a968c
n
2019-12-01 05:03:18 -07:00
89aa08837f
Updated Access, Bluespace Trash (again). Fixes
...
Updated Engineering and Medical hardsuits to require access for their applicable departments.
Moved Virus Containment into it's proper file.
Put Bluespace Trashbag back in the advanced sanitation crate.
Spellcheck.
2019-12-01 05:12:14 -05:00
1d91e1acf4
Merge pull request #10016 from deathride58/mousedropfixes
...
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
2019-11-30 22:51:42 -08:00
0f721cbfca
Merge pull request #10017 from Putnam3145/volume-filter
...
Makes filters volume-based
2019-12-01 06:47:16 +00:00
e1a9c8e6d3
Merge pull request #9972 from Ghommie/Ghommie-cit403
...
Fixed double whitespace gap in human, ai and carbon examine.
2019-11-30 22:46:29 -08:00
aaf9f12e11
Merge pull request #9981 from Ghommie/Ghommie-cit407
...
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
2019-11-30 22:44:06 -08:00
a196e3f45b
Merge pull request #9977 from Useroth/new-tg-plants
...
[FIX] Another patch for the recently added tg plants.
2019-11-30 22:23:41 -08:00
44c621e5e9
Merge pull request #9895 from Thalpy/OrganQoL
...
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
2019-11-30 22:22:52 -08:00
66114f9c37
Removed Power Tools, Tweaked EF Crate
...
Removed Power Tool Crate
Made exotic footwear non-contraband, and increased price.
2019-11-30 00:49:14 -05:00
1b310d41bf
Filters are now volume-based.
2019-11-29 21:23:08 -08:00
6b3f992d8e
fixes paperbins and papercutters proper
2019-11-29 23:11:27 -05:00
b1fca2b74b
Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it
2019-11-29 22:59:37 -05:00
00f7305aa5
holy shit
2019-11-29 17:15:49 -08:00
a524ca6f18
Spellchecking and Crate balance.
...
Integrated #9939 spellchecking.
Rebalanced Emergency Medical Supplies, EMS Lite, and advanced janitorial crate. (Also added to Advanced Janitorial and Power Tools crate that they require access.)
2019-11-29 16:54:04 -05:00
ad53b10faa
Merge pull request #9964 from GrayRachnid/fixmyblunder
...
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2019-11-29 06:20:18 -08:00
4f018b070f
Merge pull request #9996 from Ghommie/Ghommie-cit413
...
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
3b437417b9
Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
...
Nerfs nanite adrenals
2019-11-29 05:42:49 -08:00
521fdec59b
Merge pull request #9960 from Ghommie/Ghommie-cit398
...
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
ace239fe8f
Merge pull request #9962 from Ghommie/Ghommie-cit399
...
Fixes limbs' set_disabled.
2019-11-28 23:11:36 -07:00
40179da15e
Merge pull request #9965 from GrayRachnid/addfuntothekitchen
...
Adds Fun to the Kitchen's stacking skills
2019-11-28 23:11:24 -07:00
4183d00da2
Merge pull request #9966 from Ghommie/Ghommie-cit400
...
Ports elements: Lightweight shared/global components.
2019-11-28 23:08:32 -07:00
f287af694b
Merge pull request #9969 from Linzolle/hat-man-bad
...
revert knocking people's hats off
2019-11-28 23:04:34 -07:00
7495ce602a
Merge pull request #9693 from Ghommie/Ghommie-cit310
...
Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-28 23:03:07 -07:00
2c19c55fc3
Update nanite_programs.dm
2019-11-28 23:00:09 -07:00
7990d1328b
Fixes tinfoil hats giving random traumas.
2019-11-29 06:48:52 +01:00
2bd4ac5de8
Also AI and Carbon
2019-11-29 06:31:23 +01:00
e4d37db02c
thanks travis
2019-11-29 05:46:26 +01:00
65245dafed
Fixes ai displays status being reset to "Neutral" on login.
2019-11-29 04:07:56 +01:00
6cc07c5bc3
Ports the energy gun empty state overlay fix.
2019-11-29 02:59:54 +01:00
340e86e0f4
This is what you get for using magic numbers, assholes!
2019-11-29 02:45:38 +01:00
ee55170b3f
Fixed Meat Crates
2019-11-28 18:30:43 -05:00
c8d3856d73
Sanity
2019-11-28 20:34:41 +01:00
f2d6e6b78f
Allows people to squeeze it into another container.
2019-11-28 20:31:30 +01:00
a5b5fb729a
Merge pull request #9959 from Ghommie/Ghommie-cit397
...
patching some combat mode edge cases and issues.
2019-11-28 19:16:44 +00:00
9bef7edd0f
Rags are no longer transparent reagent containers.
2019-11-28 19:59:34 +01:00
85a6d588a8
[fix] Extradimensional oranges now actually grow properly and give proper seeds.
2019-11-28 09:26:52 +01:00
b6df1126bb
Can't I make a PR without having to make 2 commits to fix my mistakes oh my god
2019-11-27 22:52:21 -05:00
Winter Flare