Commit Graph
10943 Commits
Author SHA1 Message Date
kappa-samaandGitHub af0cbc460b charger 2019-12-03 23:18:03 -05:00
kevinz000andGitHub 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
Putnam 4e2c72f2ed makes traitor removable 2019-12-03 16:58:32 -08:00
Seris02 72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Ghommie 428234c0d6 Dilemma. 2019-12-03 06:53:46 +01:00
Ghommie fa270c8a79 leftovers. 2019-12-03 06:48:25 +01:00
Ghommie 6e318bfb09 Fixes traitor codewords highlight and some other hear signal hoonks. 2019-12-03 06:31:35 +01:00
Ghommie fdea134d64 dum 2019-12-03 04:30:46 +01:00
Ghommie 3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
LinandGitHub 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
Ghommie 9b62a5ad01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:33:32 +01:00
Ghommie 8615c0ea8f Merge branch 'Ghommie-cit394' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit394 2019-12-03 02:32:59 +01:00
LinandGitHub 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
Winter Flare c31ca96e87 Rebalanced Meat Crate 2019-12-02 16:21:48 -05:00
Putnam3145andGitHub 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145andGitHub 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
Putnam3145andGitHub 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
Putnam3145andGitHub 4942002698 Merge pull request #10022 from Sishen1542/n
techfabs are now easier to investigate
2019-12-01 13:44:00 -08:00
Linzolle efbc85cb40 couple fxies 2019-12-01 15:39:55 -06:00
Linzolle 19b004edab update butchering 2019-12-01 14:35:11 -06:00
Seris02andGitHub cebf2d2de2 does putnam's suggestion
I edited this on a web browser so if it breaks blame putnam
2019-12-02 00:30:20 +08:00
Sishen 3ccc88e2b9 Update meteor_wave.dm 2019-12-01 05:15:41 -07:00
Sishen a4323b2e4e Update _production.dm 2019-12-01 05:10:30 -07:00
Sishen 3ac863d0ac Revert "n"
This reverts commit 975a1a968c.
2019-12-01 05:09:34 -07:00
Sishen 975a1a968c n 2019-12-01 05:03:18 -07:00
Winter Flare 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
Putnam3145andGitHub 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
LinandGitHub 0f721cbfca Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2019-12-01 06:47:16 +00:00
Putnam3145andGitHub 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
Putnam3145andGitHub 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
Putnam3145andGitHub 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
Putnam3145andGitHub 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
Seris02 b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00
Winter Flare 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
Putnam 1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
deathride58 6b3f992d8e fixes paperbins and papercutters proper 2019-11-29 23:11:27 -05:00
deathride58 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
Seris02 136698ce7d Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination 2019-11-30 10:26:21 +08:00
Seris02 9788586bb2 fixes some things :hjonk: 2019-11-30 10:23:22 +08:00
84c2b7cef6 Update code/modules/flufftext/Hallucination.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-11-30 10:02:23 +08:00
Putnam 00f7305aa5 holy shit 2019-11-29 17:15:49 -08:00
Winter Flare 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
Linzolle 4863deb978 blood ratio 2019-11-29 12:59:25 -06:00
Seris02 a4fb86df48 forgot to add it to the list of hallucinations you can have 2019-11-30 01:00:23 +08:00
Seris02 1e8227346c adds sleeping carp wrist wrench/violent grab hallucination 2019-11-30 00:50:27 +08:00
Putnam3145andGitHub 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
Putnam3145andGitHub 4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
2019-11-29 06:16:36 -08:00
Putnam3145andGitHub 3b437417b9 Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
Nerfs nanite adrenals
2019-11-29 05:42:49 -08:00
kevinz000andGitHub 521fdec59b Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
2019-11-28 23:11:57 -07:00
kevinz000andGitHub ace239fe8f Merge pull request #9962 from Ghommie/Ghommie-cit399
Fixes limbs' set_disabled.
2019-11-28 23:11:36 -07:00