fe1576583c
Update code/modules/vending/cola.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-16 15:01:16 -05:00
Putnam3145 and GitHub
6365a430cc
Merge pull request #10208 from Ghommie/Ghommie-cit469
...
Fixes AI being unable to talk through the holopad.
2019-12-16 10:57:26 -08:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
Ghommie
9c5a66af67
Fixes AI being unable to talk through the holopad.
2019-12-16 15:58:10 +01:00
51a17dff94
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:42 -05:00
c291511ab6
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:35 -05:00
bfbb6231a5
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:28 -05:00
2d488bee52
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:21 -05:00
3e86e2207e
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:07 -05:00
21b7fb0759
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:22:58 -05:00
r4d6 and GitHub
7142894ce7
Make the boop louder.
2019-12-16 09:02:01 -05:00
r4d6 and GitHub
2e4187b7c8
Add a boop sound effect
2019-12-16 08:56:51 -05:00
Ghommie
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
r4d6 and GitHub
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05: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
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
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
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
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
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
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
