2f46b68e11
switching to non combat mode attack_self() and AltClick(), less clunky.
2019-07-21 11:22:19 +02:00
1a47fedade
More intuitive, way less weird edge cases.
2019-07-21 10:26:16 +02:00
fc78d02242
Fixing towels and improving them.
2019-07-21 09:58:54 +02:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
ab3c5acb0e
Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
...
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
44063e523d
missing flag.
2019-07-18 02:14:00 +02:00
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
adaac8322c
Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47
...
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
2019-07-17 17:53:39 -04:00
03ef2c5257
Merge branch 'master' into NO-MORE-FETISH-CONTENT
2019-07-17 14:17:33 -07:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
c06d495731
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
...
REMOVE #C8A5DC. COLOR STRONG.
2019-07-14 14:48:49 -07:00
67510809ef
Webedits are a bad trip.
2019-07-14 15:14:21 +01:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
2259ea2e1c
Merge pull request #8874 from Ghommie/Ghommie-cit132
...
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-14 03:33:37 -07:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
280aa9da08
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
...
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
5bd2f28d69
Removed #C8A5DC
2019-07-12 01:02:43 -07:00
d36bae06a7
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
27a8876e99
I dont care anymore, It works in testing to function fine
...
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
2019-07-11 01:15:39 -04:00
146276014c
Update other_reagents.dm
2019-07-10 20:42:12 -04:00
48e15307c5
Update other_reagents.dm
2019-07-10 19:14:57 -04:00
ac9c672fa8
I guess this is better
2019-07-10 18:56:32 -04:00
ed89ac874b
this was fine
2019-07-10 18:44:14 -04:00
baf4529e52
Update other_reagents.dm
2019-07-10 18:32:10 -04:00
d53d11de6b
Apply suggestions from code review
...
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-07-10 18:21:03 -04:00
8f555b0fdd
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
2019-07-10 21:35:47 +01:00
c9e13f8d62
better wording*
2019-07-10 02:43:18 -04:00
54c28b19af
Zelus indeed
2019-07-10 02:29:42 -04:00
e1ed96f419
Update other_reagents.dm
2019-07-09 23:08:11 -04:00
b03c197d0e
forgot the var
2019-07-09 22:58:13 -04:00
6240222ed7
Update other_reagents.dm
2019-07-09 21:58:22 -04:00
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
42cee552fe
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
...
Ports "Fixes every issue in the slimes milestone. #44450 "
2019-07-08 18:10:46 -04:00
6944725cfb
Merge pull request #8824 from Ghommie/Ghommie-cit109
...
Ports "Fixes damp rag not smothering people"
2019-07-07 02:31:26 -07:00
cc39c9f896
Merge branch 'master' into master
2019-07-06 16:03:17 +01:00
f4307f919b
Nerfed changeling transformation string by making it temporary.
2019-07-05 16:49:02 -07:00
a915821d1a
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
2019-07-04 23:24:39 +01:00
ad37ec08b2
Removing slimejelly req from feedback.
2019-07-04 23:24:18 +01:00
3c2e03c247
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
2019-07-04 23:46:04 +02:00
37cf41a3bb
Ports "Fixes damp rag not smothering people"
2019-07-04 22:06:16 +02:00
8a6e669060
Merge branch 'master' into master
2019-07-04 03:14:29 +01:00
bce4ce31ab
Merge pull request #8778 from Ghommie/Ghommie-cit97
...
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
2019-07-03 13:47:04 -07:00
1fd50cc15a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
2019-07-03 04:52:57 +02:00
ffecca8c11
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-03 03:24:28 +02:00
27aad8f117
Quick in case.
2019-07-02 22:42:07 +01:00
946fbff999
+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.
2019-07-02 22:15:32 +01:00
d876b20a0b
Quickfix for botany and removed message_admins that I thought I pushed.
2019-07-01 22:32:42 +01:00
Ghommie