kevinz000
|
5c8e585010
|
Merge pull request #9292 from Ghommie/Ghommie-cit94
Fixes clown shoes and work boots.
|
2019-09-21 01:42:03 -07:00 |
|
kevinz000
|
f898c99f62
|
Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
|
2019-09-21 01:39:29 -07:00 |
|
kevinz000
|
7d192c305a
|
Merge pull request #9306 from kappa-sama/voidcell
Abductor batteries can be used to unlock abductor research
|
2019-09-21 01:39:08 -07:00 |
|
kevinz000
|
30fa8d8231
|
Merge pull request #9293 from Ghommie/Ghommie-cit195
leftover legcuffs/handcuffs overlays fix.
|
2019-09-21 01:38:14 -07:00 |
|
kevinz000
|
a9965d64b3
|
Merge pull request #9312 from Linzolle/ligament
ports ligament surgeries as well as dissection
|
2019-09-21 01:37:47 -07:00 |
|
Fermi
|
a08c1229d6
|
OKAY now I'm done I think.
|
2019-09-21 09:31:53 +01:00 |
|
Fermi
|
4b44b31aa3
|
Okay, feature done
|
2019-09-21 08:24:46 +01:00 |
|
Fermi
|
2b80998f64
|
Adds: cybernetic_heart_u and VV viewer.
|
2019-09-21 04:19:34 +01:00 |
|
YakumoChen
|
e297dbd0a3
|
Update energy_gun.dm
|
2019-09-21 02:39:47 +00:00 |
|
Fermi
|
491ff293c5
|
Tweaks and jazz
|
2019-09-21 02:59:06 +01:00 |
|
Fermi
|
2bd5ee184d
|
THIS SHOULDN'T FIND IT'S WAY INTO A PR
|
2019-09-21 01:50:39 +01:00 |
|
Fermi
|
079fbbed2b
|
Merge branch 'Reagents_bitflats' into Wiki-fermi
|
2019-09-21 01:40:13 +01:00 |
|
Fermi
|
0d49fdff54
|
Blob
|
2019-09-21 01:37:35 +01:00 |
|
Fermi
|
37a1e39744
|
Merge branch 'master' into Wiki
|
2019-09-21 01:29:45 +01:00 |
|
Fermi
|
f37215ec5a
|
Okay, few misses.
|
2019-09-21 01:26:48 +01:00 |
|
Fermi
|
5b11ffd281
|
Should be kinda working maybe. But with feeling!!
|
2019-09-21 01:23:26 +01:00 |
|
Linzolle
|
8bc8a0e440
|
fix shit
|
2019-09-20 18:25:36 -05:00 |
|
Sishen
|
43f39a75d6
|
Update runes.dm
|
2019-09-20 18:45:44 -04:00 |
|
Sishen
|
37d52239e3
|
Update runes.dm
|
2019-09-20 18:39:50 -04:00 |
|
Fermi
|
8b477a8bcf
|
Edits output to be a .md and now you can open it in game!! Magic!
|
2019-09-20 23:30:51 +01:00 |
|
skoglol
|
c1e84774ac
|
one-hand shit
|
2019-09-20 17:28:44 -05:00 |
|
Fermi
|
13cf5a7822
|
Updates
|
2019-09-20 22:51:14 +01:00 |
|
Linzolle
|
deeceafb77
|
cult fixes
|
2019-09-20 16:38:37 -05:00 |
|
Fermi
|
59c82894a1
|
Sprinkles!
|
2019-09-20 22:15:55 +01:00 |
|
Ghommie
|
1f2c19c1da
|
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-20 22:57:06 +02:00 |
|
Fermi
|
55c3a48026
|
Oops
|
2019-09-20 21:56:39 +01:00 |
|
Fermi
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
Fermi
|
e6a5530363
|
Fixes
|
2019-09-20 20:06:38 +01:00 |
|
Fermi
|
9cca272986
|
Fixes quant errors, I hope.
|
2019-09-20 19:54:21 +01:00 |
|
Fermi
|
79b1d33008
|
classic oops
|
2019-09-20 19:46:53 +01:00 |
|
Fermi
|
9b2f67d67d
|
reagent_flags is used elsewhere, renamed to chemical_flags
|
2019-09-20 19:43:37 +01:00 |
|
Ghommie
|
ec9bf9ed17
|
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
|
2019-09-20 19:04:28 +02:00 |
|
Ghommie
|
277f031143
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-20 02:27:39 +02:00 |
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|
Thalpy
|
79011190c1
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 21:26:42 +01:00 |
|
Fermi
|
b8190552f1
|
Update defines, and vars, and created new procs
|
2019-09-19 21:24:50 +01:00 |
|
Fermi
|
d2c49d7987
|
On_mob_dead!
|
2019-09-19 20:30:35 +01:00 |
|
Fermi
|
70098f8bc8
|
Merge branch 'master' into Reagents_bitflats
|
2019-09-19 20:04:10 +01:00 |
|
Fermi
|
7ef5ab0332
|
TO TEST - also needs #9099 merging.
|
2019-09-19 17:52:45 +01:00 |
|
Fermi
|
b9a2a5ce38
|
Oops
|
2019-09-19 15:41:26 +01:00 |
|
Fermi
|
a398f64b66
|
Okay
|
2019-09-19 15:33:40 +01:00 |
|
Fermi
|
40bac8c807
|
t
|
2019-09-19 14:44:12 +01:00 |
|
Fermi
|
d8e6f4247e
|
Traaavis
|
2019-09-19 13:40:44 +01:00 |
|
Trilbyspaceclone
|
cce3889abb
|
1/4 the blood taken rate
|
2019-09-19 08:39:17 -04:00 |
|
Linzolle
|
573932437e
|
COMMA
|
2019-09-18 23:55:52 -05:00 |
|
Linzolle
|
cd2e894ebe
|
display results and wording
|
2019-09-18 23:51:35 -05:00 |
|
Linzolle
|
4bf9c8cc84
|
citadel fixes
|
2019-09-18 23:15:05 -05:00 |
|
XDTM
|
023428f6a4
|
port experimental dissection
|
2019-09-18 23:04:11 -05:00 |
|
XDTM
|
8ad11d7250
|
ports ligament surgeries
|
2019-09-18 22:55:46 -05:00 |
|
Fermi
|
df4da58ce8
|
Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix
|
2019-09-19 01:46:32 +01:00 |
|