f4a76781fa
Removed robicist headset from the engineering channel
...
Words
2019-12-16 08:18:35 -05:00
b0e8fb42cd
AAAAA
2019-12-16 14:00:14 +01:00
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
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05:00
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
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
a784235e35
scanline
2019-12-16 02:05:52 -07:00
f11ab5eb61
hm
2019-12-15 23:29:25 -07:00
80ffb13f06
bypass joblock
2019-12-15 23:24:43 -07:00
78e9b82eb6
trying too hard
2019-12-15 23:03:44 -07:00
57748fcdc8
changes
2019-12-15 22:28:41 -07:00
4a68a5c33f
fixes combo text
2019-12-16 12:59:19 +08:00
932bdfd325
kay
2019-12-15 21:57:22 -07:00
9f71900052
oop
2019-12-15 23:29:01 -05:00
b6c9c73372
this cannot go wrong
2019-12-15 23:28:17 -05:00
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
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07:00
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
3b47949f82
haha fuck that's a lotta changes
2019-12-15 19:59:15 -07:00
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
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
491958475b
fixed
2019-12-15 18:48:50 -06:00
6a5a098458
Fixing the blood bank generator.
2019-12-16 01:43:21 +01:00
5f27103641
god FUCK you icons
2019-12-15 17:30:30 -07:00
0190054c97
Update carbon.dm
2019-12-15 17:08:41 -07:00
e08b5b814f
Update lighting.dm
2019-12-15 17:04:23 -07:00
e496b7c397
Update eyes.dm
2019-12-15 17:02:43 -07:00
ce5c42f323
Update good.dm
2019-12-15 17:02:00 -07:00
745297632d
Update lighting.dm
2019-12-15 16:59:09 -07:00
ea84526661
Update good.dm
2019-12-15 16:58:44 -07:00
762cd00a5f
Update eyes.dm
2019-12-15 16:55:56 -07:00
ad88481f3e
OwO whats this notices your
2019-12-15 16:45:34 -07:00
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
f244ac84b2
whoops
2019-12-15 15:25:47 -08:00
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
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
22aba489e3
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-16 00:21:28 +01:00
008c4ef822
according to all known laws of aviation
2019-12-15 16:18:42 -07:00
9bfba1d1d9
Merge branch 'master' into xantholne-christmas01
2019-12-15 16:14:37 -07:00
0a4a2acbab
fixing double-flavour ice creams.
2019-12-16 00:00:58 +01:00
138f2d05f0
Made intrigue not care about valid.
2019-12-15 14:49:43 -08:00
3d0d1de94c
Added bloodsucker weights.
2019-12-15 14:49:32 -08:00
3b526fdb9b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers
2019-12-15 14:41:47 -08:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
f8a05b5ae1
perhaps
2019-12-15 17:31:49 -05:00
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
58f4f58cd2
Slaughter demons shouldnt bleed
2019-12-16 00:05:51 +02:00
6593b2a5a7
Fixes some quirks not being properly removed when deleted.
2019-12-15 23:02:41 +01:00
MrJWhit