Commit Graph

12492 Commits

Author SHA1 Message Date
Seris02 2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
kappa-sama 7d77159748 5->20 2019-12-04 21:04:47 -05:00
Useroth 950b884da5 Adds colored fairygrass. 2019-12-05 01:47:42 +01:00
Ghommie ccd966ed28 Update, fix. 2019-12-04 20:32:25 +01:00
Ghommie 9455597e31 special snowflake. 2019-12-04 20:23:44 +01:00
Ghommie c25508f1c2 turns dog/cat petting into an element. 2019-12-04 20:18:03 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
kappa-sama 525d36cc6b chaos 2019-12-03 23:18:45 -05:00
kappa-sama af0cbc460b charger 2019-12-03 23:18:03 -05:00
kevinz000 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
Ghommie 91ffa11bc9 Nerfs circuit pneumatic cannons and guns with extra sanity checks. 2019-12-04 01:07:36 +01:00
Ghommie 71a5d12c44 Don't run away Assembly!! I'll end you!! 2019-12-03 23:08:11 +01:00
Artur af4eaf7f0f Fixeesss 2019-12-03 23:09:11 +02: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
Lin 100e1e0507 why didn't I do this earlier 2019-12-03 01:40:37 +00:00
Lin 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
Lin 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
Artur 90113838a7 Iconfix and co
Traits instead of procs for fakedeath

Quickfix

Whoops this too

Loadsa fixes

Nerfs stamina regen

Too slow

Hm
2019-12-02 19:48:02 +02:00
Putnam3145 8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145 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
Putnam3145 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
Trilbyspaceclone 82ab55453b Apply suggestions from code review
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-12-01 20:57:13 -05:00
Linzolle f4318c9dba bleeding indicator for more than jsut heparin 2019-12-01 18:10:48 -06:00
Putnam3145 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
Seris02 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
Artur f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02: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
Putnam3145 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
Lin 0f721cbfca Merge pull request #10017 from Putnam3145/volume-filter
Makes filters volume-based
2019-12-01 06:47:16 +00:00
Putnam3145 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
Putnam3145 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
Putnam3145 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
Putnam3145 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
Artur 9b20879ba5 Ditto 2019-12-01 00:07:07 +02:00
Seris02 b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00