Commit Graph

30275 Commits

Author SHA1 Message Date
kevinz000
d97b1d4e80 Update mech_fabricator.dm 2020-02-14 15:30:06 -07:00
CitadelStationBot
d3926d73ac Automatic changelog generation for PR #10792 [ci skip] 2020-02-14 12:44:18 -06:00
kevinz000
245e3e0dfb Merge pull request #10792 from Ghommie/Ghommie-cit539
topic_input removal and odysseus syringe gun fix.
2020-02-14 11:44:15 -07:00
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
kevinz000
02b7764e9b Merge pull request #11092 from Citadel-Station-13/Ghommie-patch-3-1
Something about a PR, simple mathematical expressions and SSmobs wait value.
2020-02-14 11:38:32 -07:00
CitadelStationBot
cb59a4c934 Automatic changelog generation for PR #11013 [ci skip] 2020-02-14 12:34:04 -06:00
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01:00
CitadelStationBot
c2c1c755cd Automatic changelog generation for PR #11070 [ci skip] 2020-02-14 12:22:07 -06:00
Ghom
b0d85c4aea Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18
ghosts can not force re rendering of storage to a different size
2020-02-14 19:22:05 +01:00
CitadelStationBot
d73003a330 Automatic changelog generation for PR #10934 [ci skip] 2020-02-14 12:21:52 -06:00
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
2020-02-14 19:21:48 +01:00
Ghom
e36a581889 Merge pull request #11065 from Citadel-Station-13/kevinz000-patch-17
removes bluespace dick compression
2020-02-14 19:21:11 +01:00
CitadelStationBot
ed8f32d16f Automatic changelog generation for PR #11063 [ci skip] 2020-02-14 12:21:01 -06:00
Ghom
2654843862 Merge pull request #11063 from Zellular/Animations1
Minor Pupdozer fix
2020-02-14 19:20:58 +01:00
CitadelStationBot
ac0c1a3ccf Automatic changelog generation for PR #10916 [ci skip] 2020-02-14 12:20:35 -06:00
Ghom
78ace8e855 Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
2020-02-14 19:20:32 +01:00
CitadelStationBot
43d93c4a1b Automatic changelog generation for PR #11051 [ci skip] 2020-02-14 12:18:02 -06:00
Ghom
b9ab0cebb3 Merge pull request #11051 from Citadel-Station-13/kevinz000-patch-2
nerfs hand teleporters to have a dispel delay
2020-02-14 19:17:59 +01:00
CitadelStationBot
57113a4146 Automatic changelog generation for PR #11061 [ci skip] 2020-02-14 12:17:07 -06:00
Ghom
fe332571fd Merge pull request #11061 from Trilbyspaceclone/patch-285
Massive metal tower shields now are not transparent
2020-02-14 19:17:04 +01:00
Ghom
da4d13934a Update DNA.dm 2020-02-14 13:52:05 +01:00
CitadelStationBot
6e88af07d1 Automatic changelog generation for PR #11062 [ci skip] 2020-02-14 06:36:42 -06:00
Ghom
4512845fc3 Merge pull request #11062 from Citadel-Station-13/kevinz000-patch-10
Changes to organ decay rate (tip it's not 15 minutes 0-100 damage and this was lying to you)
2020-02-14 13:36:39 +01:00
Ghom
be978c4480 Merge pull request #11037 from InnocentFire/Plain-markings-update
Updates to markings_notmammals.dmi again
2020-02-14 08:26:31 +01:00
CitadelStationBot
6a8530a617 Automatic changelog generation for PR #11045 [ci skip] 2020-02-14 01:26:03 -06:00
Ghom
0b8dd2a03d Merge pull request #11045 from Trilbyspaceclone/patch-280
Flat guns can no longer be suppressed
2020-02-14 08:26:00 +01:00
CitadelStationBot
ee6d96db43 Automatic changelog generation for PR #11046 [ci skip] 2020-02-14 01:25:49 -06:00
Ghom
9e222e37c0 Merge pull request #11046 from Trilbyspaceclone/patch-281
Changes the Stickmans projectile to be the correct caliber
2020-02-14 08:25:46 +01:00
CitadelStationBot
c87c43ee45 Automatic changelog generation for PR #11042 [ci skip] 2020-02-14 01:04:19 -06:00
Ghom
2f417ef95a Merge pull request #11042 from Arturlang/pandemic_nerfs
Nerfs the pandemics production.
2020-02-14 08:04:16 +01:00
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows
adds the bow
2020-02-14 08:01:12 +01:00
CitadelStationBot
51b8c7934e Automatic changelog generation for PR #11056 [ci skip] 2020-02-14 00:54:44 -06:00
Ghom
7be2602664 Merge pull request #11056 from necromanceranne/bloodgunsnotgood
Bullets no longer do equal blood volume deletion to unmitigated damage; replicates #9682
2020-02-14 07:54:41 +01:00
CitadelStationBot
93782f8598 Automatic changelog generation for PR #11081 [ci skip] 2020-02-14 00:46:44 -06:00
Ghom
e76fc296a4 Merge pull request #11081 from Detective-Google/prefbreakies-ooh-woo
Makes the valentines chocolates no longer rule 9 bait
2020-02-14 07:46:41 +01:00
CitadelStationBot
79b440d07e Automatic changelog generation for PR #11079 [ci skip] 2020-02-14 00:36:14 -06:00
Ghom
ef7347fc37 Merge pull request #11079 from Arturlang/patch-9
Makes valentine related antag datums convertable by bloodsuckers
2020-02-14 07:36:11 +01:00
CitadelStationBot
9b75c5dbf8 Automatic changelog generation for PR #11076 [ci skip] 2020-02-14 00:28:55 -06:00
Ghom
075f22f154 Merge pull request #11076 from Arturlang/Biotypes_refactor
Turns mob biotypes into flags instead of lists.
2020-02-14 07:28:53 +01:00
Detective Google
6c4c4b3f81 removes the crocin from the valentines candy 2020-02-13 19:59:38 -06:00
Arturlang
cf980b52ac Fuck valentines 2020-02-14 00:01:07 +02:00
Linzolle
790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle
083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle
9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle
f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle
d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
CitadelStationBot
821496e67c Automatic changelog generation for PR #11044 [ci skip] 2020-02-13 09:50:13 -06:00
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
CitadelStationBot
73fa603aca Automatic changelog generation for PR #10913 [ci skip] 2020-02-13 09:49:05 -06:00