This website requires JavaScript.
ea4c414cde
Automatic changelog generation for PR #10005 [ci skip]
2019-12-01 00:36:29 -06:00
fde3f52212
Merge pull request #10005 from Commandersand/loadoutcit
2019-11-30 22:36:27 -08:00
1d1a2796d5
Automatic changelog generation for PR #9977 [ci skip]
2019-12-01 00:23:44 -06:00
a196e3f45b
Merge pull request #9977 from Useroth/new-tg-plants
2019-11-30 22:23:41 -08:00
2f11a73127
Automatic changelog generation for PR #9895 [ci skip]
2019-12-01 00:22:55 -06:00
44c621e5e9
Merge pull request #9895 from Thalpy/OrganQoL
2019-11-30 22:22:52 -08:00
f1f4086955
Automatic changelog generation for PR #9893 [ci skip]
2019-11-30 23:48:52 -06:00
c3dc0e7c71
Merge pull request #9893 from Putnam3145/threat-log-fixes
2019-11-30 22:48:50 -07:00
1c1a5cca61
reverts adding cc winter coat to cc z level
2019-12-01 06:21:25 +08:00
9b20879ba5
Ditto
2019-12-01 00:07:07 +02:00
9afbabb55e
removes cult coat for now, adds coats to places
2019-12-01 05:42:43 +08: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
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
ae729d400b
Permabrig broken area fix
2019-11-30 03:25:21 +00: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
2019-11-30 10:02:23 +08:00
8c9bae52d8
Automatic changelog generation for PR #10015 [ci skip]
2019-11-29 19:30:30 -06:00
fad36f2031
Merge pull request #10015 from Putnam3145/fix-traitor
2019-11-29 17:30:28 -08:00
d73b93d4a7
Addresses Aelita + Gray + Sylvara, fixes cams, detective office & HoP stamp, room names and airlock cyclelink
2019-11-30 01:30:12 +00: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
e9e5f5ab62
Brainwash Surgery not locked
2019-11-29 16:40:46 -06:00
c9c648f7ad
Whoops forgot about citadel restricted jobs
2019-11-30 00:07:02 +02:00
a524ca6f18
Spellchecking and Crate balance.
2019-11-29 16:54:04 -05:00
c0e77f8fdf
Update code/game/objects/items/stacks/medical.dm
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
67754daf22
Fixed
2019-11-29 10:57:51 -06:00
7ddaaea267
Cats
2019-11-29 10:56:18 -06:00
88bd7678b1
Eee
2019-11-29 10:55:00 -06:00
a608003555
Equals
2019-11-29 10:53:57 -06:00
1e8227346c
adds sleeping carp wrist wrench/violent grab hallucination
2019-11-30 00:50:27 +08:00
81977819ac
Automatic changelog generation for PR #9964 [ci skip]
2019-11-29 08:20:20 -06:00
ad53b10faa
Merge pull request #9964 from GrayRachnid/fixmyblunder
2019-11-29 06:20:18 -08:00
7f0f8e0be8
Automatic changelog generation for PR #9996 [ci skip]
2019-11-29 08:16:39 -06:00
4f018b070f
Merge pull request #9996 from Ghommie/Ghommie-cit413
2019-11-29 06:16:36 -08:00
3b437417b9
Merge pull request #10000 from Citadel-Station-13/kevinz000-patch-119
2019-11-29 05:42:49 -08:00
c8bc6941eb
"don't copy paste code"
2019-11-29 02:46:31 -06:00
0da35fdde5
again
2019-11-29 02:33:33 -06:00
f9d8c41c3e
newline needed apparently
2019-11-29 02:32:47 -06:00
2c2f3ea8aa
mandatory meme
2019-11-29 02:03:31 -06:00
60cee5814a
keyholesweater
2019-11-29 01:59:34 -06:00
22d0dbc05b
sundress and stripper
2019-11-29 01:56:47 -06:00
5b7bf08d10
sundress
2019-11-29 01:47:41 -06:00
b715c088f6
add athletic shorts to loadout
2019-11-29 01:27:15 -06:00
57af7ba8af
add plaid skirt,multipen,fountainpen to loadout
2019-11-29 01:24:24 -06: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
e929728666
Merge conflicts
2019-11-28 23:25:05 -07: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
bcfa9c6c4d
Merge pull request #9956 from Linzolle/duke-beret
2019-11-28 23:12:35 -07:00
f0f2063884
Merge pull request #9958 from Ghommie/Ghommie-cit396
2019-11-28 23:12:19 -07:00
0c76c19e32
Automatic changelog generation for PR #9960 [ci skip]
2019-11-29 00:11:59 -06:00
521fdec59b
Merge pull request #9960 from Ghommie/Ghommie-cit398
2019-11-28 23:11:57 -07:00
b831ea4029
Automatic changelog generation for PR #9962 [ci skip]
2019-11-29 00:11:39 -06:00
ace239fe8f
Merge pull request #9962 from Ghommie/Ghommie-cit399
2019-11-28 23:11:36 -07:00
d055cb5c6c
Automatic changelog generation for PR #9965 [ci skip]
2019-11-29 00:11:26 -06:00
40179da15e
Merge pull request #9965 from GrayRachnid/addfuntothekitchen
2019-11-28 23:11:24 -07:00
9df49144f5
Automatic changelog generation for PR #9967 [ci skip]
2019-11-29 00:11:07 -06:00
bd43a08347
Merge pull request #9967 from Ghommie/Ghommie-cit401
2019-11-28 23:11:05 -07:00
0c23aad351
Automatic changelog generation for PR #9966 [ci skip]
2019-11-29 00:08:35 -06:00
4183d00da2
Merge pull request #9966 from Ghommie/Ghommie-cit400
2019-11-28 23:08:32 -07:00
7a4d7c0089
Automatic changelog generation for PR #9969 [ci skip]
2019-11-29 00:04:37 -06:00
f287af694b
Merge pull request #9969 from Linzolle/hat-man-bad
2019-11-28 23:04:34 -07:00
7495ce602a
Merge pull request #9693 from Ghommie/Ghommie-cit310
2019-11-28 23:03:07 -07:00
69e11e4203
olllll
2019-11-28 23:01:15 -07:00
3a1e4dec5a
Revert "lol"
2019-11-28 23:00:13 -07:00
2c19c55fc3
Update nanite_programs.dm
2019-11-28 23:00:09 -07:00
1d3e9e38bc
removes powergame
2019-11-29 00:58:04 -05:00
7f6a1a6fda
lol
2019-11-28 22:53:39 -07:00
7990d1328b
Fixes tinfoil hats giving random traumas.
2019-11-29 06:48:52 +01:00
184d3ff280
Merge pull request #15 from Citadel-Station-13/master
2019-11-29 00:34:35 -05:00
2bd4ac5de8
Also AI and Carbon
2019-11-29 06:31:23 +01:00
e4d37db02c
thanks travis
2019-11-29 05:46:26 +01:00
0bfa2e1438
-hit
2019-11-29 05:36:55 +01:00
77201406bc
Oh sh-
2019-11-29 05:35:53 +01:00
e6484a22a8
Ports tgstation loom changes, and durathred golems.
2019-11-29 05:34:17 +01:00
65245dafed
Fixes ai displays status being reset to "Neutral" on login.
2019-11-29 04:04:48 +01:00
66971236d5
when you forget to hit ctrl+S
2019-11-28 21:02:28 -06:00
a940110dee
spawn instead of sleep
2019-11-28 20:51:50 -06:00
6cc07c5bc3
Ports the energy gun empty state overlay fix.
2019-11-29 02:59:54 +01:00
340e86e0f4
This is what you get for using magic numbers, assholes!
2019-11-29 02:45:38 +01:00
e3439f96f0
strange reagent fix
2019-11-28 18:06:18 -06:00
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
ee55170b3f
Fixed Meat Crates
2019-11-28 18:30:43 -05:00
90009904cf
Maaapmeeergeeee?
2019-11-28 19:35:08 +00:00
c8d3856d73
Sanity
2019-11-28 20:34:41 +01:00
f2d6e6b78f
Allows people to squeeze it into another container.
2019-11-28 20:31:30 +01:00
a105f55e38
Automatic changelog generation for PR #9957 [ci skip]
2019-11-28 13:21:57 -06:00
53927c97fd
Merge pull request #9957 from Ghommie/Ghommie-cit395
2019-11-28 19:21:54 +00:00
CitadelStationBot