Commit Graph

17639 Commits

Author SHA1 Message Date
timothyteakettle 27c5897c4d update button icon and stand up 2020-10-01 00:17:17 +01:00
Zandario da0c7a0ff2 Merge remote-tracking branch 'upstream/master' into species-refactor 2020-09-30 17:06:54 -05:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Timothy Teakettle 16735e0190 silent paralysis 2020-09-30 21:40:42 +01:00
Timothy Teakettle 6b46fdbc32 fine 2020-09-30 21:16:09 +01:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
Timothy Teakettle 7cab2c658d Merge branch 'master' into slime-puddle 2020-09-30 18:43:25 +01:00
Timothy Teakettle 2223cfeb28 better 2020-09-30 18:41:30 +01:00
silicons 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Putnam c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam 0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Timothy Teakettle d783eb58bd more traits 2020-09-30 02:58:58 +01:00
Timothy Teakettle f9cf7429e1 icons and traits 2020-09-30 02:49:21 +01:00
timothyteakettle ccb774b8f2 puddles 2020-09-30 02:15:34 +01:00
Zandario 515c842976 Part 1 2020-09-29 15:14:27 -05:00
Timothy Teakettle 1b75ccb39d puddle 2020-09-29 18:38:25 +01:00
Putnam f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
Putnam 02b2248f3a i am not smart at all 2020-09-29 05:56:34 -07:00
Putnam 4d2a2b178b Made transfer_ckey reset view range. 2020-09-29 04:11:01 -07:00
Putnam 8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
timothyteakettle 396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle 783c33067b typo moment 2020-09-28 22:13:33 +01:00
Detective Google 643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
Timothy Teakettle 29368a4479 sprites 2020-09-28 18:55:01 +01:00
lolman360 a2b7fd2279 sprite 2020-09-28 16:09:10 +10:00
lolman360 9860d296b8 what the fucjk 2020-09-28 14:05:53 +10:00
Enric Gabriel f487a79922 upload headcrab.dm 2020-09-27 20:05:25 -03:00
silicons 532381c280 Update hydroponics.dm 2020-09-27 13:57:57 -07:00
Tupinambis d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
EmeraldSundisk 7f0834608e Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
Citadel station 13 master
2020-09-27 10:09:12 -07:00
silicons 822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
silicons 7300ab26e3 Merge pull request #13439 from Tupinambis/polywantabugfix
Fixes a 5+ year old bug with ghost poly's hex value that potentially causes runtimes and crashes.
2020-09-27 00:37:06 -07:00
silicons 9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6
Tweaks a thing
2020-09-27 00:33:14 -07:00
silicons 2b5a166425 Merge pull request #13421 from raspy-on-osu/teg-finale
alters the TEG's logistic power generation
2020-09-27 00:15:41 -07:00
silicons e699f32a3b Merge pull request #13420 from thakyZ/lightreplacer-change
Light replacer can print at Engineering
2020-09-27 00:13:50 -07:00
silicons c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits
Adds engineering hazard jumpsuits
2020-09-27 00:11:30 -07:00
silicons c6d7bc886f Merge pull request #13414 from Putnam3145/its-2-seconds-yall
Fixed an erroneous comment that may cause issues.
2020-09-27 00:10:26 -07:00
silicons f66c60884d Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
Properly standardizes fuid production rate.
2020-09-27 00:10:12 -07:00
silicons e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
2020-09-27 00:09:56 -07:00
silicons 00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
silicons 32a3ae406d Update gas_mixture.dm 2020-09-26 23:58:32 -07:00
Tupinambis 87ac8d06c7 Fixes a spelling error in a variable 2020-09-27 00:59:50 -05:00
DeltaFire d0247bdb3b modifies heretic sac husking a bit
The husking caused by heretic sacrifices is not healable with synthflesh. In exchange, the sacrificed humanoid suffers 200 additional burn damage, making them ever so slightly harder to immediately restore.
2020-09-27 05:35:33 +02:00
Tupinambis cd5b108627 Alpha 2020-09-26 12:47:11 -05:00
DeltaFire 29d2a12d55 fixes revenants reviving
fix for issue #13166
2020-09-26 16:29:11 +02:00
Tupinambis 63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05:00
The0bserver 47ff98e4c5 Adds examine text, removes old self sustain checks 2020-09-25 18:12:26 -04:00
DeltaFire 0746116e17 fixes a bunch of blacksmithing stuff
the blacksmithing skill is now actually dwarfy instead of not because of a typo

picking up how ingots without gloves is now not a better decision than picking them up with non-heatresistant gloves.

you can't interact with anvils while they are already being worked to prevent issues.

Also fixes associative skill level code a tiny bit.
2020-09-25 22:04:55 +02:00
Mark9013100 bbf5c7f43e Merge branch 'master' into 09/22/20_engi_hazard_jumpsuits 2020-09-25 15:45:38 -04:00
Mark9013100 e4f9849cc3 Adds engineering hazard jumpsuits 2020-09-25 15:40:38 -04:00