kevinz000
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
Fermi
816ae638a2
[TO_TEST]
2019-09-05 23:19:53 +01:00
Fermi
29e5c1c10a
Still some residual chems kicking about..!!
2019-09-05 23:15:30 +01:00
Trilbyspaceclone
dbdaae83b6
Update medicine_reagents.dm
2019-09-04 13:29:58 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Fermi
51a6ae96a0
R.data
2019-08-12 00:37:57 +01:00
Fermi
c0bbb099f8
Fixes disappearing chems.
2019-08-12 00:36:45 +01:00
Fermi
004b79d4cd
Vodka is alkaline
2019-08-08 15:31:07 +01:00
Fermi
99e95dcedf
Guess who forgot message admins
2019-08-07 18:57:38 +01:00
Fermi
10b2cec485
Adds a analyse function for advanced chems
2019-08-07 16:52:58 +01:00
Thalpy
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
Ghommie
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
kevinz000
25eba5829d
Merge pull request #8980 from Ghommie/Ghommie-cit159
...
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
2019-07-29 04:44:08 -07:00
kevinz000
3713533c18
Merge pull request #8983 from Ghommie/Ghommie-cit161
...
One liner fix for the most useless feature of the year.
2019-07-29 04:41:23 -07:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Fermi
31709938c6
Pushing a buncha stuff so I can fix things.
2019-07-28 23:23:45 +01:00
kevinz000
e79bf3ab07
Merge pull request #8969 from Sishen1542/hypofix
...
chemmaster now spits out 60u hypovials
2019-07-27 21:54:36 -07:00
Ghommie
acc338378d
One liner fix for the most useless feature of the year.
2019-07-27 19:44:17 +02:00
Ghommie
911f148003
Fixes hypovials unable to dump liquids and chem master unable to dispense in pill bottles.
2019-07-27 03:48:21 +02:00
Sishen
a1a626ba29
hypovial shit
...
iddqd
2019-07-25 19:11:58 -04:00
Ghommie
c06c1d9b60
typo.
2019-07-21 12:11:18 +02:00
Ghommie
ce4e86279c
Further improvements.
2019-07-21 11:58:58 +02:00
Ghommie
5504fb6a6a
Alt click examine string.
2019-07-21 11:27:26 +02:00
Ghommie
2f46b68e11
switching to non combat mode attack_self() and AltClick(), less clunky.
2019-07-21 11:22:19 +02:00
Ghommie
1a47fedade
More intuitive, way less weird edge cases.
2019-07-21 10:26:16 +02:00
Ghommie
fc78d02242
Fixing towels and improving them.
2019-07-21 09:58:54 +02:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
kevinz000
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
kevinz000
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
Ghommie
44063e523d
missing flag.
2019-07-18 02:14:00 +02:00
Ghommie
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
deathride58
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
BurgerLUA
03ef2c5257
Merge branch 'master' into NO-MORE-FETISH-CONTENT
2019-07-17 14:17:33 -07:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Ghommie
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
kevinz000
c06d495731
Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC
...
REMOVE #C8A5DC. COLOR STRONG.
2019-07-14 14:48:49 -07:00
Fermi
67510809ef
Webedits are a bad trip.
2019-07-14 15:14:21 +01:00
Thalpy
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000
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
Thalpy
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
kevinz000
280aa9da08
Merge pull request #8860 from Trilbyspaceclone/Zelus_oil
...
Zelus oil - CWC gear
2019-07-12 07:41:28 -07:00
BurgerLua
5bd2f28d69
Removed #C8A5DC
2019-07-12 01:02:43 -07:00
Ghommie
d36bae06a7
Ports the Chem Master choose your pill PR plus post-improvements
2019-07-12 07:39:17 +02:00
Trilbyspaceclone
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
Trilbyspaceclone
146276014c
Update other_reagents.dm
2019-07-10 20:42:12 -04:00
Trilbyspaceclone
48e15307c5
Update other_reagents.dm
2019-07-10 19:14:57 -04:00
Trilbyspaceclone
ac9c672fa8
I guess this is better
2019-07-10 18:56:32 -04:00
Trilbyspaceclone
ed89ac874b
this was fine
2019-07-10 18:44:14 -04:00
