Commit Graph

4364 Commits

Author SHA1 Message Date
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
chefferz dca81de36c Gives His Grace stamina regeneration
His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten.

This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion.
2019-08-22 20:09:52 -04:00
kevinz000 ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
2019-08-21 08:15:08 -07:00
Poojawa 32c7a7c3ee Virology's broken as fuck, damnifino why 2019-08-21 03:36:40 -05:00
Poojawa b29607c019 It's working again, I guess. wtf 2019-08-21 01:36:59 -05:00
Poojawa 23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise 2019-08-20 23:03:31 -05:00
Poojawa 96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Sishen 7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Sishen ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
Trilbyspaceclone d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
Poojawa cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 2019-08-19 04:48:37 -05:00
kevinz000 3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188
Reblances bone satchles
2019-08-18 23:39:39 -07:00
kevinz000 3ef29bbbeb Merge pull request #9097 from lolman360/durathread
Adds durathread.
2019-08-18 23:37:07 -07:00
TrilbySpaceClone 2b08b97f1d yay 2019-08-17 23:54:50 -04:00
Poojawa 2eac1b6ca2 Everything's working again, for now. 2019-08-17 08:04:18 -05:00
Poojawa 2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
Poojawa 725a8046e1 just need items to actually have their overlays, ree 2019-08-17 04:50:24 -05:00
Poojawa 088bc484e3 Forensics re-destroyed, but better this time.
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
Trilbyspaceclone 906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00
lolman360 ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
lolman360 7d12535ead thanks paxxy boi 2019-08-17 12:18:18 +10:00
lolman360 e838da8039 Merge pull request #3 from Citadel-Station-13/master
3
2019-08-17 11:55:56 +10:00
Poojawa 8bd54bcc54 I'm just waiting for a better idea before dumping this hot garbage again 2019-08-16 06:24:42 -05:00
Poojawa c3fb13c140 meh. 2019-08-16 05:10:55 -05:00
Poojawa d71f37167f I'm about to go fucking APE
None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm
2019-08-16 04:58:16 -05:00
Poojawa 264cbf8108 reverts the add_blood back to add_blood_DNA 2019-08-15 12:49:10 -05:00
Poojawa 0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Sishen 6fab91046d Update misc.dm 2019-08-15 13:04:28 -04:00
Poojawa 2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
Winter Flare 04c302b08e Service Tweaks
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
2019-08-15 06:28:46 -04:00
Sishen ad91152c83 Update misc.dm 2019-08-14 17:08:33 -04:00
Sishen f6baaf8c58 honk honk 2019-08-14 17:06:58 -04:00
Sishen 3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Winter Flare 141a93236c Service QoL
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
2019-08-14 04:01:18 -04:00