Commit Graph

19520 Commits

Author SHA1 Message Date
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283
Blood Drunk Miner now uses a PKA
2020-02-15 09:05:45 +01:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2
Ring Improvements
2020-02-15 09:04:54 +01:00
Ghom
ad639d5f2f Merge pull request #11084 from Citadel-Station-13/kevinz000-patch-7
!tgs valentine
2020-02-15 09:04:29 +01:00
kevinz000
f6cf5adb4c Update mech_fabricator.dm 2020-02-14 15:33:47 -07:00
kevinz000
d97b1d4e80 Update mech_fabricator.dm 2020-02-14 15:30:06 -07:00
kevinz000
f36b89a6e3 Update misc.dm 2020-02-14 11:53:50 -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
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01: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
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
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
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
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
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
kevinz000
efc94565b6 Update misc.dm 2020-02-14 00:40:50 -07:00
kevinz000
e9baf17233 Update misc.dm 2020-02-14 00:40:19 -07:00
kevinz000
4677bd47be Update vday.dm 2020-02-14 00:39:29 -07: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
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
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
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
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
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
kevinz000
94c6fae838 Update vday.dm 2020-02-13 21:27:44 -07:00
YakumoChen
2924be6a80 now with visible rings on hand(s) 2020-02-14 03:52:10 +00:00
kevinz000
b8d18758d1 Update vday.dm 2020-02-13 20:33:18 -07:00
YakumoChen
5c246fd389 diamond ring changes
More code I stole from RP
2020-02-14 03:00:31 +00: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
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
Ghom
28a6384427 Merge pull request #10913 from Feasel/patch-3
[Balance Pass - Dissection Early Game Buff]
2020-02-13 16:49:01 +01:00
Ghom
91824571ff Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
2020-02-13 16:42:10 +01:00
Ghom
121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Ghom
a4a9701c98 Merge pull request #11022 from kevinz000/ssprofiler
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
Ghom
7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
Artur
be30ca1642 Tweaks the blood type and volume, plus hopefully fixes the lag exploit. 2020-02-13 15:48:37 +02:00
Artur
8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
kevinz000
5d3f39b1ae Update DNA.dm 2020-02-13 05:39:59 -07:00
kevinz000
87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000
3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00