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
BlackMajor
4d6b9f5da1
Merge pull request #8537 from Ghommie/Ghommie-cit28
...
Fixes emags wasting charges on un-emaggable stuff.
2019-08-28 13:54:03 +12:00
Trilbyspaceclone
6cf4783486
fixed
2019-08-27 13:56:47 -04:00
TrilbySpaceClone
419ea7f58c
Fancy_part1
2019-08-27 12:41:47 -04:00
Trilbyspaceclone
77863119f2
Update wallets.dm
2019-08-27 11:31:52 -04:00
kevinz000
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
TrilbySpaceClone
00c01709b2
moves banners into crafting
2019-08-26 15:46:41 -04:00
Poojawa
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
Poojawa
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
Poojawa
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
TrilbySpaceClone
44893b6ee7
It just works
2019-08-26 06:32:54 -04:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
kappa-sama
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
Rob Bailey
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
TrilbySpaceClone
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
Ghommie
24fe7126c4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-08-24 19:05:51 +02:00
Ghommie
f843a53fe9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
2019-08-24 12:52:16 +02:00
chefferz
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
Sishen
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
Dap
a80dfada21
[WIP] Plasmaglass Tables!
...
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.
## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.
## Changelog
🆑
add: Plasmaglass tables
/🆑
2019-08-23 12:38:07 -06:00
chefferz
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
chefferz
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
