Commit Graph

13933 Commits

Author SHA1 Message Date
r4d6
51a17dff94 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:42 -05:00
r4d6
c291511ab6 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:35 -05:00
r4d6
bfbb6231a5 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:28 -05:00
r4d6
2d488bee52 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:21 -05:00
r4d6
3e86e2207e Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:23:07 -05:00
r4d6
21b7fb0759 Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-12-16 09:22:58 -05:00
r4d6
7142894ce7 Make the boop louder. 2019-12-16 09:02:01 -05:00
r4d6
2e4187b7c8 Add a boop sound effect 2019-12-16 08:56:51 -05:00
r4d6
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
r4d6
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
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
kevinz000
f11ab5eb61 hm 2019-12-15 23:29:25 -07:00
kevinz000
80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
kevinz000
78e9b82eb6 trying too hard 2019-12-15 23:03:44 -07:00
kevinz000
57748fcdc8 changes 2019-12-15 22:28:41 -07:00
kevinz000
932bdfd325 kay 2019-12-15 21:57:22 -07:00
kappa-sama
9f71900052 oop 2019-12-15 23:29:01 -05:00
kappa-sama
b6c9c73372 this cannot go wrong 2019-12-15 23:28:17 -05:00
kevinz000
b4bd2cbb5c Update preferences.dm 2019-12-15 20:20:04 -07:00
kevinz000
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
kevinz000
3b47949f82 haha fuck that's a lotta changes 2019-12-15 19:59:15 -07:00
Ghommie
843f4ed0da FLAK 2019-12-16 02:44:58 +01:00
BlackMajor
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
kevinz000
5f27103641 god FUCK you icons 2019-12-15 17:30:30 -07:00
kevinz000
0190054c97 Update carbon.dm 2019-12-15 17:08:41 -07:00
kevinz000
e496b7c397 Update eyes.dm 2019-12-15 17:02:43 -07:00
kevinz000
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
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
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
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
kappa-sama
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
Trilbyspaceclone
499c2a30e7 corrections for .4 metaballic rate 2019-12-15 13:59:54 -05:00
kevinz000
8c27c176ca move this.. 2019-12-15 09:12:58 -07:00
BlackMajor
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
Trilbyspaceclone
9a2311b72b grammar 2019-12-15 02:42:17 -05:00
Trilbyspaceclone
b41eb4426e there's 2019-12-15 02:38:38 -05:00
kevinz000
db767d8ddf bad idea 2019-12-15 00:37:34 -07:00
kevinz000
a4ffef5b1f Typos 2019-12-15 00:36:20 -07:00
kevinz000
297c909b76 resting stuff 2019-12-15 00:29:18 -07:00
kevinz000
586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
kevinz000
4970675467 s 2019-12-15 00:06:11 -07:00