Ghommie
|
29114de3f1
|
The actual waterflower, am I funny yet?
|
2019-11-12 00:47:36 +01:00 |
|
Ghommie
|
a650e1e411
|
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
|
2019-11-05 05:37:28 +01:00 |
|
Ghommie
|
2d8e383b9c
|
Quickfixing hypospray missin icons.
|
2019-10-28 00:52:47 +01:00 |
|
Ghommie
|
bf92aa2ffb
|
Unmodularize MkII hyposprays and other reagent items sprites.
|
2019-10-26 19:14:28 +02:00 |
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
kevinz000
|
1d0931ede9
|
Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
|
2019-10-17 13:23:33 -07:00 |
|
Fermi
|
00adead300
|
Fixes syringes too.
|
2019-10-15 21:43:04 +01:00 |
|
Thalpy
|
e115c456f3
|
Ohh I'm fixing
|
2019-10-15 13:41:49 +01:00 |
|
Thalpy
|
acc0ff8a17
|
Adds craftable extended mags
|
2019-10-15 12:37:35 +01:00 |
|
Thalpy
|
23743c8630
|
Updates chemmaster
|
2019-10-15 11:21:05 +01:00 |
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
Winter Flare
|
2bce423ec3
|
Added a -ton- of stuff to the Kinkmate
|
2019-10-10 14:08:14 -04:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
Poojawa
|
9f88a72142
|
Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
|
2019-10-04 16:06:07 -05:00 |
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
Fermi
|
0dcdede8fa
|
In response to poll and feedback.
|
2019-09-22 02:28:59 +01:00 |
|
kevinz000
|
5608d37fd5
|
Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
|
2019-09-21 01:56:41 -07:00 |
|
TrilbySpaceClone
|
5ecf68918b
|
tada
|
2019-09-18 03:47:52 -04:00 |
|
Trilbyspaceclone
|
a751a73113
|
Apply suggestions from code review
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com>
|
2019-09-10 18:52:49 -04:00 |
|
Trilbyspaceclone
|
275457001d
|
It didnt save my last change
|
2019-09-08 21:52:28 -04:00 |
|
TrilbySpaceClone
|
0e12a4f8d1
|
and swing!
|
2019-09-08 21:39:32 -04:00 |
|
Poojawa
|
cede93299e
|
REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
|
2019-08-19 04:48:37 -05:00 |
|
Poojawa
|
dcd682bd59
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-10 23:48:47 -05:00 |
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05: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 |
|
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 |
|