Commit Graph

14703 Commits

Author SHA1 Message Date
Thalpy
af80bf3204 MINUTE defines. 2019-05-29 18:41:51 +01:00
Thalpy
6811896f34 Bloodmath redone. 2019-05-29 18:30:22 +01:00
Thalpy
45149ffc11 Beaker resistance check moved. 2019-05-29 18:29:56 +01:00
BlackMajor
93464b8f24 Adds bluespace compression kit 2019-05-30 02:46:34 +12:00
Ghommie
8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Ghommie
5309eafb59 Fine and be it, man. 2019-05-29 11:24:27 +02:00
Ghommie
12648720dc tweakin. 2019-05-29 10:41:43 +02:00
Ghommie
bcf1072399 fixes eyestabbing, better this time. 2019-05-29 10:08:00 +02:00
Ghommie
fe5ac5e6e9 On the other hand, vehicle memes. 2019-05-29 09:24:12 +02:00
Ghommie
894b0d28e2 Krav maga leg sweep buff. 2019-05-29 08:45:45 +02:00
Useroth
16826eba66 Tweaks n' stuff. 2019-05-29 08:45:21 +02:00
Fermi
ae35366e97 Some fixes before bed. 2019-05-29 05:41:12 +01:00
Fermi
6b4188ab86 British spellingggg 2019-05-29 04:33:46 +01:00
Fermi
7129969606 Some comments didn't delete properly. 2019-05-29 04:02:04 +01:00
Fermi
51b4bdb8ea Removed wizard edit (oops) 2019-05-29 03:57:43 +01:00
Fermi
67860a9fff Removed Kev File, sorry Kev. 2019-05-29 03:49:51 +01:00
Fermi
42513fda9b Pre extra file culling. 2019-05-29 03:49:14 +01:00
Fermi
01a38479fa Why did I fiddle with things I shouldn't have. 2019-05-29 03:16:11 +01:00
Fermi
91cfd8e052 Before say component remove. 2019-05-29 03:01:47 +01:00
Fermi
336ba8dbad Tidying code. 2019-05-29 02:33:15 +01:00
Fermi
543dc9a399 Final fixes, finally fixed all problems. 2019-05-29 01:33:07 +01:00
deathride58
3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Trilbyspaceclone
5ead987d53 Update hierophant.dm 2019-05-28 19:01:32 -04:00
Trilbyspaceclone
69a39b4f67 Update hierophant.dm 2019-05-28 18:56:16 -04:00
Fermi
89665de8a7 Last round of test checks. 2019-05-28 22:33:04 +01:00
Fermi
48ae55d61d Sishen implementation 2019-05-28 19:25:31 +01:00
kevinz000
8cd0b69b61 adrenals 2019-05-28 01:00:41 -07:00
Useroth
848f3910e6 Oops. Now it compiles fine. 2019-05-28 09:32:59 +02:00
Useroth
eb6e710b18 Forgot to uncomment the clown check on the shoes. 2019-05-28 09:17:03 +02:00
Useroth
bd4108c094 ... 2019-05-28 09:04:13 +02:00
Useroth
939eb35a3f Tae-clown-do v1 2019-05-28 09:02:26 +02:00
Sishen1542
c57968ec13 Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-05-28 00:29:56 -04:00
Fermi
8282819c84 CHECK PLASMA THOUGH! 2019-05-28 05:03:58 +01:00
Sishen
6707d1b2fd Update species.dm 2019-05-27 23:24:52 -04:00
Trilbyspaceclone
7a17ca381b tweaks 2019-05-27 21:58:09 -04:00
Sishen1542
0a11e98950 Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-05-27 20:53:42 -04:00
Sishen1542
e07493b0fa Update code/modules/mob/living/carbon/human/species.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-05-27 20:53:35 -04:00
Fermi
df2a14880e Beginning comment purge. 2019-05-28 00:35:33 +01:00
Sishen
8771ae5822 masochism and buttslap fixes 2019-05-27 18:51:52 -04:00
Ghommie
cc334b9a57 honestly if they don't wear a gas mask, they do deserve the stunlock...
But ok.
2019-05-28 00:43:54 +02:00
Ghommie
b5c4a44f01 pepper spray & teargas de-dunked. 2019-05-28 00:30:55 +02:00
kevinz000
aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
2019-05-27 15:09:11 -07:00
kevinz000
031779a944 32 --> 25 2019-05-27 14:28:17 -07:00
kevinz000
6ed955ddde Update beams.dm 2019-05-27 14:25:45 -07:00
kevinz000
4913f332c7 Update stun.dm 2019-05-27 14:23:29 -07:00
kevinz000
e8036a8a9b Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
2019-05-27 14:08:52 -07:00
kevinz000
76314e463e Merge pull request #8443 from deathride58/stripfix
Item stripping no longer gets interrupted by changes in your actively held item
2019-05-27 14:08:04 -07:00
Fermi
5771fd9442 Should be the last fix. 2019-05-27 20:52:05 +01:00
Fermi
79a7b6b45b Fixes. 2019-05-27 20:25:57 +01:00
JTGSZ
93813613aa Some changes. 2019-05-27 14:42:07 -04:00