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 |
|
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 |
|
Seris02
|
b5f732c838
|
formal and cc winter coats + start of cult coats
|
2019-12-01 04:06:03 +08: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 |
|
Seris02
|
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 |
|
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 |
|
Putnam3145
|
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 |
|
Putnam3145
|
4f018b070f
|
Merge pull request #9996 from Ghommie/Ghommie-cit413
Fixes tinfoil hats giving random traumas.
|
2019-11-29 06:16:36 -08:00 |
|
Putnam3145
|
3b437417b9
|
Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
Nerfs nanite adrenals
|
2019-11-29 05:42:49 -08:00 |
|
kevinz000
|
521fdec59b
|
Merge pull request #9960 from Ghommie/Ghommie-cit398
Ports custom reagent icecreams.
|
2019-11-28 23:11:57 -07:00 |
|
kevinz000
|
ace239fe8f
|
Merge pull request #9962 from Ghommie/Ghommie-cit399
Fixes limbs' set_disabled.
|
2019-11-28 23:11:36 -07:00 |
|
kevinz000
|
40179da15e
|
Merge pull request #9965 from GrayRachnid/addfuntothekitchen
Adds Fun to the Kitchen's stacking skills
|
2019-11-28 23:11:24 -07:00 |
|
kevinz000
|
4183d00da2
|
Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
|
2019-11-28 23:08:32 -07:00 |
|
kevinz000
|
f287af694b
|
Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
|
2019-11-28 23:04:34 -07:00 |
|
kevinz000
|
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 |
|
Sishen
|
69e11e4203
|
olllll
|
2019-11-28 23:01:15 -07:00 |
|
Sishen
|
3a1e4dec5a
|
Revert "lol"
This reverts commit 7f6a1a6fda.
|
2019-11-28 23:00:13 -07:00 |
|
kevinz000
|
2c19c55fc3
|
Update nanite_programs.dm
|
2019-11-28 23:00:09 -07:00 |
|
Sishen
|
7f6a1a6fda
|
lol
|
2019-11-28 22:53:39 -07:00 |
|
Ghommie
|
7990d1328b
|
Fixes tinfoil hats giving random traumas.
|
2019-11-29 06:48:52 +01:00 |
|
Ghommie
|
2bd4ac5de8
|
Also AI and Carbon
|
2019-11-29 06:31:23 +01:00 |
|
Ghommie
|
e4d37db02c
|
thanks travis
|
2019-11-29 05:46:26 +01:00 |
|
Ghommie
|
e6484a22a8
|
Ports tgstation loom changes, and durathred golems.
|
2019-11-29 05:34:17 +01:00 |
|
Ghommie
|
65245dafed
|
Fixes ai displays status being reset to "Neutral" on login.
|
2019-11-29 04:07:56 +01:00 |
|
Linzolle
|
66971236d5
|
when you forget to hit ctrl+S
|
2019-11-28 21:02:28 -06:00 |
|
Linzolle
|
a940110dee
|
spawn instead of sleep
|
2019-11-28 20:51:50 -06:00 |
|
Ghommie
|
6cc07c5bc3
|
Ports the energy gun empty state overlay fix.
|
2019-11-29 02:59:54 +01:00 |
|
Ghommie
|
340e86e0f4
|
This is what you get for using magic numbers, assholes!
|
2019-11-29 02:45:38 +01:00 |
|
Linzolle
|
e3439f96f0
|
strange reagent fix
|
2019-11-28 18:06:18 -06:00 |
|
Ghommie
|
c8d3856d73
|
Sanity
|
2019-11-28 20:34:41 +01:00 |
|
Ghommie
|
f2d6e6b78f
|
Allows people to squeeze it into another container.
|
2019-11-28 20:31:30 +01:00 |
|
Lin
|
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 |
|