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
f48d8016d5
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-01 13:51:57 +02: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
010bee19f4
damn you feasel
2019-12-01 00:22:15 -08:00
b914791a87
???
2019-12-01 09:09:08 +01:00
219529d375
Merge pull request #9980 from Ghommie/Ghommie-cit406
...
Ports "Removes phantom gas effects on space tiles"
2019-11-30 22:53:07 -08: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
c3dc0e7c71
Merge pull request #9893 from Putnam3145/threat-log-fixes
...
[DYNAMIC] Roundend threat log only shows changes that fully happened
2019-11-30 22:48:50 -07:00
9b20879ba5
Ditto
2019-12-01 00:07:07 +02:00
b5f732c838
formal and cc winter coats + start of cult coats
2019-12-01 04:06:03 +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
136698ce7d
Merge branch 'sleepingcarphallucination' of https://github.com/Seris02/Citadel-Station-13 into sleepingcarphallucination
2019-11-30 10:26:21 +08:00
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
00f7305aa5
holy shit
2019-11-29 17:15:49 -08:00
a6e6274039
Reviewer fixes and spacing
2019-11-30 01:21:07 +02:00
07a5b13abd
Update uplink_items.dm
2019-11-29 16:45:17 -06:00
c9c648f7ad
Whoops forgot about citadel restricted jobs
2019-11-30 00:07:02 +02: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
c0e77f8fdf
Update code/game/objects/items/stacks/medical.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-29 15:10:30 -06:00
36b0ef53a0
bruh
2019-11-29 14:49:29 -06:00
4c4935f155
yeet
2019-11-29 14:13:39 -06:00
02048ce009
Bludsuckers
2019-11-29 21:28:14 +02:00
d9636398e1
Fixes implant pads
2019-11-29 20:12:10 +01:00
4863deb978
blood ratio
2019-11-29 12:59:25 -06:00
a4fb86df48
forgot to add it to the list of hallucinations you can have
2019-11-30 01:00:23 +08:00
1e8227346c
adds sleeping carp wrist wrench/violent grab hallucination
2019-11-30 00:50:27 +08: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
5aed21a6f0
It's just list tabbing, gray.
2019-11-29 07:43:31 +01:00
f5b4d6a0ad
Oh bummers.
2019-11-29 07:27:05 +01:00
233ca30cd6
Merge branch 'master' into xantholne-christmas01
2019-11-28 23:21:36 -07:00
9b8ed8ca4f
The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs.
2019-11-29 07:14:51 +01:00
f0f2063884
Merge pull request #9958 from Ghommie/Ghommie-cit396
...
Ports a few telecomms updates and fixes.
2019-11-28 23:12:19 -07: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
bd43a08347
Merge pull request #9967 from Ghommie/Ghommie-cit401
...
Ports "Plasmamen get plasma in their box"
2019-11-28 23:11:05 -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
Sishen