a4d6911324
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:29 -05:00
13aaebcd22
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:22 -05:00
r4d6 and GitHub
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05:00
CitadelStationBot
5f59d7a9c5
Automatic changelog generation for PR #10115 [ci skip]
2019-12-16 05:24:00 -06:00
BlackMajor and GitHub
d1a37fd192
Merge pull request #10115 from Useroth/lavaland-tumors
...
[READY] Ported lavaland tumors and elites from tg.
2019-12-17 00:23:57 +13:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
DeltaFire
05497bb392
Changes required to enable for maintenance protocols
...
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
kappa-sama and GitHub
9f71900052
oop
2019-12-15 23:29:01 -05:00
kappa-sama and GitHub
b6c9c73372
this cannot go wrong
2019-12-15 23:28:17 -05:00
CitadelStationBot
6e08366d40
Automatic changelog generation for PR #9736 [ci skip]
2019-12-15 21:20:41 -06:00
Lin and GitHub
b54c8a6a2a
Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
...
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
kevinz000 and GitHub
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07:00
CitadelStationBot
05460586e1
Automatic changelog generation for PR #9971 [ci skip]
2019-12-15 21:11:11 -06:00
kevinz000 and GitHub
ba7a3f5fd2
Merge pull request #9971 from Xantholne/xantholne-christmas01
...
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
Ghommie
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
Ghommie
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
BlackMajor and GitHub
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
loginsandylogout and GitHub
491958475b
fixed
2019-12-15 18:48:50 -06:00
Ghommie
6a5a098458
Fixing the blood bank generator.
2019-12-16 01:43:21 +01:00
kevinz000 and GitHub
0190054c97
Update carbon.dm
2019-12-15 17:08:41 -07:00
kevinz000 and GitHub
e08b5b814f
Update lighting.dm
2019-12-15 17:04:23 -07:00
kevinz000 and GitHub
e496b7c397
Update eyes.dm
2019-12-15 17:02:43 -07:00
kevinz000 and GitHub
ce5c42f323
Update good.dm
2019-12-15 17:02:00 -07:00
kevinz000 and GitHub
745297632d
Update lighting.dm
2019-12-15 16:59:09 -07:00
kevinz000 and GitHub
ea84526661
Update good.dm
2019-12-15 16:58:44 -07:00
kevinz000 and GitHub
762cd00a5f
Update eyes.dm
2019-12-15 16:55:56 -07:00
Unknown
ad88481f3e
OwO whats this notices your
2019-12-15 16:45:34 -07:00
CitadelStationBot
bdb6ef4dda
Automatic changelog generation for PR #10198 [ci skip]
2019-12-15 17:42:16 -06:00
Putnam3145 and GitHub
363380405e
Merge pull request #10198 from Ghommie/Ghommie-cit466
...
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-15 15:42:13 -08:00
CitadelStationBot
050551e569
Automatic changelog generation for PR #10195 [ci skip]
2019-12-15 17:25:02 -06:00
Putnam3145 and GitHub
56a349bcd0
Merge pull request #10195 from Ghommie/Ghommie-cit464
...
Fixes a few quirks not being properly removed when deleted, also bringing them in line with the rest instead of being removable through surgery.
2019-12-15 15:24:59 -08:00
CitadelStationBot
78575bd47d
Automatic changelog generation for PR #10197 [ci skip]
2019-12-15 17:24:20 -06:00
Putnam3145 and GitHub
7aa454dbbb
Merge pull request #10197 from Ghommie/Ghommie-cit465
...
fixing double-flavour (and bland custom) ice creams.
2019-12-15 15:24:17 -08:00
Ghommie
22aba489e3
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-16 00:21:28 +01:00
Unknown
008c4ef822
according to all known laws of aviation
2019-12-15 16:18:42 -07:00
Unknown
9bfba1d1d9
Merge branch 'master' into xantholne-christmas01
2019-12-15 16:14:37 -07:00
Ghommie
0a4a2acbab
fixing double-flavour ice creams.
2019-12-16 00:00:58 +01:00
CitadelStationBot
423b2e7e90
Automatic changelog generation for PR #10011 [ci skip]
2019-12-15 16:41:39 -06:00
Putnam3145 and GitHub
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
kappa-sama and GitHub
f8a05b5ae1
perhaps
2019-12-15 17:31:49 -05:00
Ghommie
7118210911
GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D.
...
WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
2019-12-15 23:07:18 +01:00
Artur
58f4f58cd2
Slaughter demons shouldnt bleed
2019-12-16 00:05:51 +02:00
Ghommie
6593b2a5a7
Fixes some quirks not being properly removed when deleted.
2019-12-15 23:02:41 +01:00
Ghommie
d3d1f8328f
compiles now.
2019-12-15 22:16:02 +01:00
loginsandylogout and GitHub
6f9be0c863
saves the world
2019-12-15 14:11:44 -06:00
CitadelStationBot
7ee71f9702
Automatic changelog generation for PR #10144 [ci skip]
2019-12-15 14:08:48 -06:00
Putnam3145 and GitHub
b7d082a204
Merge pull request #10144 from Linzolle/sabre-noise
...
makes the officer's sabre play the un/sheating noise properly
2019-12-15 12:08:46 -08:00
Ghommie
80f47872d7
My head splodes.
2019-12-15 20:31:36 +01:00
BlackMajor
c6732bb516
typo lol
2019-12-16 01:28:34 +13:00
BlackMajor
4b177c4956
Adjusted NF balance
2019-12-16 01:20:14 +13:00
