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
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
8934f9b401
Update flypeople.dm
2020-02-14 17:24:50 +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
Blue Wildrose
d45a20c19b
Podpeople tweaks
...
- Podpeople can wag tails now
- Moved a few features into the podperson race itself instead of its weaker, roundstart variant; this in theory, will allow pod-grown hydroponics podpeople to have hair now, as well as all those anthropomorphic features, should they be revived through this method.
- Fixed the lifebringers having no name somehow but... currently lifebringers under this change will turn them into animal anthropomorphic hairy mutants of some kind until I figure out how to make them the bald podpeople that they once were, could use some help with this.
2020-02-14 05:12:50 -07:00
BlueWildrose
1b9195ce4b
Merge pull request #1 from Citadel-Station-13/master
...
aaaaaaaaa
2020-02-14 04:59:24 -07:00
Ghommie
0f5952fff7
Something about blood and species.
2020-02-14 09:48:10 +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
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
Ghommie
e053721820
Fix for solar panels/trackers being wonky.
2020-02-14 07:15:13 +01:00
kevinz000
94c6fae838
Update vday.dm
2020-02-13 21:27:44 -07:00
YakumoChen
8bf3025636
mislabeled ring rings on hands
2020-02-13 22:53:14 -05:00
YakumoChen
2924be6a80
now with visible rings on hand(s)
2020-02-14 03:52:10 +00:00
YakumoChen
6046d5b0b5
rings on hands
2020-02-13 22:49:27 -05:00
kevinz000
0861179a79
Update chat_commands.dm
2020-02-13 20:34:48 -07:00
kevinz000
b8d18758d1
Update vday.dm
2020-02-13 20:33:18 -07:00