 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Ghommie
|
d36bae06a7
|
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-12 07:39:17 +02:00 |
|
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
|
Ghommie
|
37cf41a3bb
|
Ports "Fixes damp rag not smothering people"
|
2019-07-04 22:06:16 +02:00 |
|
|
Thalpy
|
b6309d5a31
|
Fixes explosion bug, tweaks hypo and fiddles pH.
|
2019-06-29 02:47:32 +01:00 |
|
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
|
Fermi
|
fec1df2098
|
Rephrasal for understanding.
|
2019-06-19 00:52:45 +01:00 |
|
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
|
Fermi
|
7a66039f0c
|
Fixing merge errors.
Testmerge ready.
|
2019-06-14 21:55:17 +01:00 |
|
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
|
Fermi
|
aa1cb22edc
|
Eigenstate fixes.
|
2019-06-14 16:26:08 +01:00 |
|
|
Fermi
|
d7cffadc13
|
Fixes
|
2019-06-14 13:43:57 +01:00 |
|
|
Fermi
|
2365f7337c
|
Adventures in bitflags!
|
2019-06-14 12:47:22 +01:00 |
|
|
Fermi
|
e95b371ea5
|
Changed to weakness
|
2019-06-14 11:56:28 +01:00 |
|
|
Fermi
|
ab35b018db
|
Indents and eigenstate var reduction.
|
2019-06-14 11:24:21 +01:00 |
|
|
Fermi
|
c9a66544bc
|
pH and temp immune bitflagging.
|
2019-06-13 06:45:29 +01:00 |
|
|
Fermi
|
14aa7084a8
|
Breast rename.
|
2019-06-13 04:37:03 +01:00 |
|
|
Fermi
|
91e58d896e
|
Spelling is hard.
|
2019-06-13 03:24:02 +01:00 |
|
|
Fermi
|
17403bd059
|
Non-functioning EMP code for review (revert before merging.)
|
2019-06-13 00:58:54 +01:00 |
|
|
Thalpy
|
84c3c104cd
|
Pointed out that a message could be misinterpreted as lewd.
|
2019-06-08 06:32:12 +01:00 |
|
|
Fermi
|
42d0ab4825
|
Comment cleanup.
|
2019-06-08 01:31:21 +01:00 |
|
|
Fermi
|
c6c98b539d
|
Minor bug fix.
|
2019-06-08 01:22:43 +01:00 |
|
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
|
Fermi
|
fd22dbfc0d
|
More fixes. Need to check over merging math.
|
2019-06-02 03:59:52 +01:00 |
|
|
Fermi
|
0fa445c153
|
Fixes and test.
|
2019-06-02 03:24:01 +01:00 |
|
|
Fermi
|
3cf3268c76
|
New non-harmful medicinal darts.
|
2019-06-01 22:52:03 +01:00 |
|
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
|
Thalpy
|
71eb285472
|
Few tweaks and fixes to last commits.
|
2019-05-29 20:04:52 +01:00 |
|
|
Thalpy
|
45149ffc11
|
Beaker resistance check moved.
|
2019-05-29 18:29:56 +01:00 |
|
|
Ghommie
|
b5c4a44f01
|
pepper spray & teargas de-dunked.
|
2019-05-28 00:30:55 +02:00 |
|
|
Fermi
|
a0073295e1
|
Updating from Cit, pre PR.
|
2019-05-26 01:49:58 +01:00 |
|
|
Fermi
|
e3d3f30ea9
|
Could this be the final commit?!
|
2019-05-25 16:12:46 +01:00 |
|