Commit Graph

16711 Commits

Author SHA1 Message Date
DeltaFire
173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
silicons
d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
silicons
71de73e16b Merge pull request #13423 from MrJWhit/drone-e-button
Gives drones back their e button (port)
2020-10-01 03:11:04 -07:00
silicons
fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
silicons
38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons
bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
silicons
f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
silicons
ebcbe7e901 Merge pull request #13431 from EmeraldSundisk/cargoclothes
Gives Cargo Technicians the choice of longer trousers.
2020-10-01 03:03:41 -07:00
silicons
b7650f3dea Merge pull request #13398 from timothyteakettle/wound-config
wound config values, wound bonus for how damaged a limb is
2020-10-01 03:02:35 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
silicons
46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter
Ports tgstation/tgstation#52549
2020-10-01 02:56:39 -07:00
Ghom
7f08969f48 Merge pull request #13457 from SandPoot/master
Fixes not getting an action button.
2020-10-01 11:44:22 +02:00
Ghom
a2597a4d84 Merge pull request #13448 from Tupinambis/spelling
Fixes a spelling error in an armor value that caused runtimes.
2020-10-01 11:42:55 +02:00
Putnam3145
22ca31e7d4 Merge pull request #13422 from Citadel-Station-13/species_slowdown_fix
Fixes angels not being fast while flying
2020-10-01 02:40:18 -07:00
Putnam3145
50894bc627 Merge pull request #13454 from Citadel-Station-13/silicons-patch-6
fixes botany harvest causing attack hand to runtime
2020-10-01 02:39:38 -07:00
Tupinambis
67825fef74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine 2020-09-30 19:21:21 -05: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
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
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
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
Tupinambis
87ac8d06c7 Fixes a spelling error in a variable 2020-09-27 00:59:50 -05:00
Tupinambis
cd5b108627 Alpha 2020-09-26 12:47:11 -05:00
Tupinambis
63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05: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
SiliconMain
4e5296438c Update tool_designs.dm 2020-09-25 09:46:11 -05:00
Putnam3145
f6d9d4b535 Merge pull request #13426 from CoreFlare/master
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
EmeraldSundisk
079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00