kevinz000
|
bd1b79b182
|
Merge pull request #10041 from kappa-sama/patch-8
[SALT] chargers and chaos stands are now reasonable to fight
|
2019-12-05 21:29:39 -07:00 |
|
kevinz000
|
2fcdb24fe3
|
Merge pull request #10019 from Seris02/wintercoattide
Adds CentCom, Assistant's formal, ratvarian and narsian winter coats + loadout for formal
|
2019-12-05 21:29:08 -07:00 |
|
kevinz000
|
bbd482015c
|
Merge pull request #10033 from Ghommie/Ghommie-cit419
Fixes traitor codewords highlight and some other hear signal hooks.
|
2019-12-05 21:28:03 -07:00 |
|
kevinz000
|
29497320c1
|
Merge pull request #10025 from Linzolle/butchering
refactor butchering component
|
2019-12-05 21:19:57 -07:00 |
|
BlackMajor
|
b7d0cc6516
|
Merge pull request #9884 from Useroth/blackpowder-alternative
Black powder fix. Alternative to #9861
|
2019-12-06 11:32:17 +13:00 |
|
BlackMajor
|
a6f48ea74c
|
Merge pull request #9372 from Weblure/Xenobio-Hotkeys
[Ready] [Test Merge] Ports Xenobio Hotkeys
|
2019-12-06 11:29:34 +13:00 |
|
Seris02
|
0c5a1b900b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide
|
2019-12-05 21:09:38 +08:00 |
|
Seris02
|
2ce79828b8
|
ratvar coat updated
|
2019-12-05 20:46:59 +08: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Putnam
|
00f7305aa5
|
holy shit
|
2019-11-29 17:15:49 -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 |
|
kevinz000
|
2c19c55fc3
|
Update nanite_programs.dm
|
2019-11-28 23:00:09 -07:00 |
|
Ghommie
|
7990d1328b
|
Fixes tinfoil hats giving random traumas.
|
2019-11-29 06:48:52 +01:00 |
|