TrilbySpaceClone
|
41fbb759b2
|
Merge branch 'master' into more_cooking2
|
2019-09-25 14:56:11 -04:00 |
|
Ghommie
|
0389293d4a
|
comma
|
2019-09-24 02:40:43 +02:00 |
|
Ghommie
|
ee8f1022cc
|
Fixes advanced med scanner upgrades, and other cyborg upgrades' incompatibility with dogborgs.
|
2019-09-24 02:02:24 +02:00 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
Ghommie
|
ff451c8cf4
|
I don't want to send emoji assets to every machine interfacing with PDA messages.
Just the chat tab.
|
2019-09-22 14:50:37 +02:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
Ghommie
|
bf2f4b5df1
|
Enables emojis for PDA messages.
|
2019-09-21 22:42:06 +02:00 |
|
Fermi
|
97fa05f446
|
Merge branch 'master' into tg-Organ-port
|
2019-09-21 14:01:52 +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 |
|
skoglol
|
c1e84774ac
|
one-hand shit
|
2019-09-20 17:28:44 -05:00 |
|
Ghommie
|
45adfd5bab
|
making it compile.
|
2019-09-20 23:20:44 +02: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
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
kevinz000
|
9108c1ce89
|
Merge pull request #9203 from Trilbyspaceclone/fancy
Makes brass tools look better*
|
2019-09-20 12:09:33 -07: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 |
|
Fermi
|
7ef5ab0332
|
TO TEST - also needs #9099 merging.
|
2019-09-19 17:52:45 +01:00 |
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
Fermi
|
aabc2423a8
|
Oops.
|
2019-09-19 01:19:45 +01:00 |
|
Fermi
|
107dd67cbe
|
Well it compiles; just synthtissue and TongueLoss now.
|
2019-09-19 01:14:12 +01:00 |
|
Fermi
|
dfa40a4b22
|
tg Code complete, now to bugtest and clear compile errors.
|
2019-09-18 23:57:21 +01:00 |
|
Ghommie
|
5e52c62f29
|
actual balance.
|
2019-09-17 03:41:53 +02:00 |
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
Ghommie
|
0d9b284784
|
unneeded variable, no gameplay changes.
|
2019-09-16 18:12:05 +02:00 |
|
Ghommie
|
ca95d39a46
|
Slowing down police baton and tele baton speed.
|
2019-09-16 17:47:22 +02:00 |
|
Poojawa
|
fa364bbad0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers
|
2019-09-13 13:00:29 -05:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
kevinz000
|
42613d1800
|
Merge pull request #9251 from Linzolle/chaplain-fashion-time
Allow all chaplain gear to equip the same things in their suit storage
|
2019-09-13 10:42:42 -07:00 |
|
Linzolle
|
213bd2fc6b
|
fixes
|
2019-09-12 23:35:21 -05:00 |
|
Poojawa
|
65a89030eb
|
reverts the bleed changes till they can be better tuned
|
2019-09-12 00:14:26 -05:00 |
|
Poojawa
|
4408d1b684
|
Gauze fully stops bleed rate on application
|
2019-09-11 05:54:17 -05:00 |
|
kevinz000
|
076b6c8699
|
Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
|
2019-09-10 22:04:48 -07:00 |
|
Trilbyspaceclone
|
d61afe0021
|
Update uplink_kits.dm
|
2019-09-10 20:29:31 -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
|
02771c9d27
|
Why didnt my last commit save at all?
|
2019-09-08 22:10:31 -04:00 |
|
TrilbySpaceClone
|
0e12a4f8d1
|
and swing!
|
2019-09-08 21:39:32 -04:00 |
|
kevinz000
|
3e9d37e70d
|
Update plushes.dm
|
2019-09-07 17:13:21 -07:00 |
|
kevinz000
|
b8374feafd
|
Update plushes.dm
|
2019-09-07 17:03:06 -07:00 |
|
Linzolle
|
64b757f404
|
refactor suits
|
2019-09-07 17:10:10 -05:00 |
|
Linzolle
|
20ea620e9e
|
literally why even
|
2019-09-07 16:46:25 -05:00 |
|
kevinz000
|
8f577e910a
|
Merge pull request #9238 from Trilbyspaceclone/surgery_stuff
Adds two more surgerys - Embalming and Body Rejuvenation
|
2019-09-07 11:37:13 -07:00 |
|
kevinz000
|
09ed526594
|
Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
|
2019-09-07 11:35:09 -07:00 |
|
kevinz000
|
87cf0b971a
|
Merge pull request #9221 from Sishen1542/chappy
adds some new nullrods with some back end null rod refactors
|
2019-09-06 16:47:46 -07:00 |
|
Chayse Ramsay
|
0cf1415969
|
[SPEEDMERGE] Glass Machine :b:roke
|
2019-09-05 16:28:18 +01:00 |
|
TrilbySpaceClone
|
084b37ae4e
|
tada
|
2019-09-04 10:13:32 -04:00 |
|
Sishen
|
d431ee1a20
|
baseball bat
|
2019-09-04 03:01:47 -04:00 |
|
Ghommie
|
9ec97579bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-03 21:08:09 +02:00 |
|
TrilbySpaceClone
|
fd585aa6ea
|
Merge branch 'master' into more_cooking2
|
2019-09-03 11:22:38 -04:00 |
|