 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 |
|
|
Ghommie
|
d9636398e1
|
Fixes implant pads
|
2019-11-29 20:12:10 +01: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 |
|
|
Ghommie
|
5aed21a6f0
|
It's just list tabbing, gray.
|
2019-11-29 07:43:31 +01:00 |
|
|
Ghommie
|
f5b4d6a0ad
|
Oh bummers.
|
2019-11-29 07:27:05 +01:00 |
|
|
Ghommie
|
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 |
|
|
kevinz000andGitHub
|
f0f2063884
|
Merge pull request #9958 from Ghommie/Ghommie-cit396
Ports a few telecomms updates and fixes.
|
2019-11-28 23:12:19 -07: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 |
|
|
kevinz000andGitHub
|
40179da15e
|
Merge pull request #9965 from GrayRachnid/addfuntothekitchen
Adds Fun to the Kitchen's stacking skills
|
2019-11-28 23:11:24 -07:00 |
|
|
kevinz000andGitHub
|
bd43a08347
|
Merge pull request #9967 from Ghommie/Ghommie-cit401
Ports "Plasmamen get plasma in their box"
|
2019-11-28 23:11:05 -07:00 |
|
|
kevinz000andGitHub
|
4183d00da2
|
Merge pull request #9966 from Ghommie/Ghommie-cit400
Ports elements: Lightweight shared/global components.
|
2019-11-28 23:08:32 -07:00 |
|
|
kevinz000andGitHub
|
f287af694b
|
Merge pull request #9969 from Linzolle/hat-man-bad
revert knocking people's hats off
|
2019-11-28 23:04:34 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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
|
0bfa2e1438
|
-hit
|
2019-11-29 05:36:55 +01:00 |
|
|
Ghommie
|
77201406bc
|
Oh sh-
|
2019-11-29 05:35:53 +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 |
|
|
LinandGitHub
|
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 |
|
|
LinandGitHub
|
46c02af86e
|
Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
|
2019-11-28 19:12:25 +00:00 |
|
|
Ghommie
|
9bef7edd0f
|
Rags are no longer transparent reagent containers.
|
2019-11-28 19:59:34 +01:00 |
|
|
Ghommie
|
74baa00634
|
Ports "#44787"
|
2019-11-28 19:37:46 +01:00 |
|
|
Putnam3145andGitHub
|
09897b4ece
|
Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
|
2019-11-28 05:37:36 -08:00 |
|
|
Useroth
|
85a6d588a8
|
[fix] Extradimensional oranges now actually grow properly and give proper seeds.
|
2019-11-28 09:26:52 +01:00 |
|
|
Ghommie
|
60b8688674
|
Ports "Fixes transit tube barricade spam"
|
2019-11-28 07:10:00 +01:00 |
|
|
Ghommie
|
e884f606c4
|
wait, what the fuck!
|
2019-11-28 05:41:49 +01:00 |
|
|
Ghommie
|
6194dddf42
|
I'll hold on this until I port the conveyor_construct conversion to stacks.
|
2019-11-28 05:40:26 +01:00 |
|
|
Ghommie
|
0ad89bd9de
|
Merging, tweaking or otherwise removing a few of the stupidest cargo packs.
|
2019-11-28 05:34:56 +01:00 |
|