 Ghommie
|
f2cf146255
|
Two slimepeople fixes.
|
2019-12-17 12:49:04 +01:00 |
|
|
BlackMajor
|
5245898c25
|
whoops
|
2019-12-17 23:46:15 +13:00 |
|
|
BlackMajor
|
03d2e9eb6d
|
Compress secK9
|
2019-12-17 23:32:51 +13:00 |
|
|
Ghommie
|
3f06661de5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
|
2019-12-17 03:34:11 +01:00 |
|
|
Ghommie
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
|
LinandGitHub
|
6f70ba1477
|
Merge pull request #10181 from Ghommie/Ghommie-cit463
Fixing a few pill bottle issues with the ChemMaster.
|
2019-12-17 01:08:27 +00:00 |
|
|
LinandGitHub
|
237fbaa02d
|
Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
|
2019-12-17 01:05:10 +00:00 |
|
|
Ghommie
|
1c3682cd15
|
Brings carbon action intent hotkeys down to living.
|
2019-12-17 00:03:39 +01:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
r4d6andGitHub
|
7142894ce7
|
Make the boop louder.
|
2019-12-16 09:02:01 -05:00 |
|
|
r4d6andGitHub
|
2e4187b7c8
|
Add a boop sound effect
|
2019-12-16 08:56:51 -05: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 |
|
|
r4d6andGitHub
|
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 |
|
|
kevinz000andGitHub
|
b4bd2cbb5c
|
Update preferences.dm
|
2019-12-15 20:20:04 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
BlackMajorandGitHub
|
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 |
|
|
Unknown
|
ad88481f3e
|
OwO whats this notices your
|
2019-12-15 16:45:34 -07:00 |
|
|
Putnam3145andGitHub
|
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 |
|
|
Putnam3145andGitHub
|
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 |
|
|
Putnam3145andGitHub
|
c39a5d0462
|
Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
|
2019-12-15 14:41:36 -08:00 |
|
|
kappa-samaandGitHub
|
f8a05b5ae1
|
perhaps
|
2019-12-15 17:31:49 -05:00 |
|
|
Artur
|
58f4f58cd2
|
Slaughter demons shouldnt bleed
|
2019-12-16 00:05:51 +02:00 |
|
|
Ghommie
|
d3d1f8328f
|
compiles now.
|
2019-12-15 22:16:02 +01:00 |
|
|
Ghommie
|
80f47872d7
|
My head splodes.
|
2019-12-15 20:31:36 +01:00 |
|
|
BlackMajor
|
4b177c4956
|
Adjusted NF balance
|
2019-12-16 01:20:14 +13:00 |
|
|
Putnam3145andGitHub
|
2e9503f6d7
|
Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
|
2019-12-14 20:37:57 -08:00 |
|
|
LinandGitHub
|
cce63507d1
|
Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
|
2019-12-15 00:16:34 +00:00 |
|
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
|
LinandGitHub
|
49c37641a7
|
Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
|
2019-12-15 00:04:58 +00:00 |
|
|
LinandGitHub
|
1f852ea92a
|
Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
|
2019-12-15 00:02:57 +00:00 |
|
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
|
Putnam3145andGitHub
|
bd1040ab60
|
Merge pull request #10171 from r4d6/patch-1
Who the fuck put 10 shielding when you need 9?
|
2019-12-14 11:04:37 -08:00 |
|
|
Ghommie
|
12b87b4f3d
|
Better.
|
2019-12-14 19:29:51 +01:00 |
|
|
Ghommie
|
2ccfaf38fb
|
consistency.
|
2019-12-14 19:27:39 +01:00 |
|
|
Ghommie
|
6117434c7f
|
Ok
|
2019-12-14 19:24:43 +01:00 |
|