kevinz000
|
ee9b38017e
|
Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
|
2020-02-15 12:17:02 -07:00 |
|
kevinz000
|
b46dd3246d
|
Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
|
2020-02-15 12:16:39 -07:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
kevinz000
|
b9e8be5784
|
Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
|
2020-02-15 12:15:50 -07:00 |
|
kevinz000
|
56545d742d
|
Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7
Nerfing cargo passive points generation
|
2020-02-15 12:15:31 -07:00 |
|
kevinz000
|
eb33901046
|
Merge pull request #11002 from BlackMajor/walkerbois
Makes the Ash Walker camp a static spawn in lavaland.
|
2020-02-15 11:47:58 -07:00 |
|
kevinz000
|
957c6168b6
|
Merge pull request #11006 from Ghommie/Ghommie-cit570
Something about a couple stack trace issues.
|
2020-02-15 11:47:30 -07:00 |
|
kevinz000
|
e250fb0a57
|
Merge pull request #11071 from Citadel-Station-13/Ghommie-patch-1
Something about disposal bins and trash bags.
|
2020-02-15 11:46:56 -07:00 |
|
kevinz000
|
6e2e7e29d1
|
Merge pull request #11072 from Ghommie/Ghommie-cit576
Doubled halved flavor text max length and removed crappy code.
|
2020-02-15 11:46:00 -07:00 |
|
kevinz000
|
29c422a2e6
|
Merge pull request #11073 from Ghommie/Ghommie-cit577
Reduced tongue organ damage and tasting pH message spam.
|
2020-02-15 11:45:50 -07:00 |
|
kevinz000
|
d2398f4584
|
Merge pull request #11075 from Citadel-Station-13/Ghommie-patch-2
Porting agent card updates and registered name fix.
|
2020-02-15 11:45:39 -07:00 |
|
kevinz000
|
fa015c93bf
|
Merge pull request #11047 from Trilbyspaceclone/patch-282
Buffs oats and makes meatwheat have rarity
|
2020-02-15 11:44:52 -07:00 |
|
kevinz000
|
76b5dec4bb
|
Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
|
2020-02-15 11:44:25 -07:00 |
|
Trilbyspaceclone
|
661e01ca0c
|
Update miscellaneous.dm (#11094)
|
2020-02-15 19:12:19 +01:00 |
|
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 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +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 |
|