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 |
|
Trilbyspaceclone
|
5eba0d55f9
|
Update trash.dm
|
2019-09-03 11:09:03 -04:00 |
|
Trilbyspaceclone
|
3f957ea488
|
grammer
|
2019-09-03 10:43:29 -04:00 |
|
Trilbyspaceclone
|
5168f2b233
|
Update granters.dm
|
2019-09-03 07:37:37 -04:00 |
|
nik707
|
2fe5571887
|
Merge pull request #9212 from dapnee/plasmaglass-tables-spears
Plasmaglass Tables, Spears, Shards (Take 2)
|
2019-09-02 18:37:22 -05:00 |
|
nik707
|
67f4276aab
|
Merge pull request #9104 from Sishen1542/tbaton
classic & telebaton no longer have attack delay
|
2019-09-02 18:35:56 -05:00 |
|
Sishen
|
0b6eb6e34c
|
Update holy_weapons.dm
|
2019-09-01 22:36:39 -04:00 |
|
Sishen
|
b4f27b8841
|
allows renaming of non null rod holyweapons, fixes hypertool description
|
2019-08-31 18:05:09 -04:00 |
|
Sishen
|
d9fff579b1
|
damage and stamina balances
|
2019-08-31 17:39:51 -04:00 |
|
Sishen
|
ba5021af5b
|
gives lasrifle the damage component, turns kevs divine lightblade into a hypereut to balance stats, adds hypertool
|
2019-08-31 02:55:29 -04:00 |
|
Sishen
|
b69c928419
|
FOR THE EMPEROR
|
2019-08-30 16:50:03 -04:00 |
|
Poojawa
|
b2252a1c74
|
Medical assistance treats bleed_rate to stop phantom bleeding
|
2019-08-30 02:46:57 -05:00 |
|
Poojawa
|
dca90db321
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-29 23:03:26 -05:00 |
|
nik707
|
bff828d3be
|
Merge pull request #9202 from Trilbyspaceclone/patch-216
Ports "Fixes wallets #510" From KeplerStation
|
2019-08-29 19:33:08 -05:00 |
|
nik707
|
fccafd6bd9
|
Merge pull request #9204 from Trilbyspaceclone/patch-217
Fixes katana's being cursed when not cursed
|
2019-08-29 19:31:40 -05:00 |
|
TrilbySpaceClone
|
d3852ebd56
|
even more
|
2019-08-29 19:39:10 -04:00 |
|
Dap
|
19678119c5
|
Merge branch 'plasmatables' into plasmaglass-tables-spears
|
2019-08-28 14:55:01 -06:00 |
|
nik707
|
8e40e9d887
|
Merge pull request #9186 from Sishen1542/walklikeanegyptian
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
|
2019-08-28 00:02:39 -05:00 |
|