f07cdc0665
Merge pull request #9177 from JTGSZ/fix
...
Fixes gang bosses being able to be deconverted with headbeatings, Adds 1 more boss slot
2019-08-26 19:42:15 -07:00
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
37642cdac2
Merge pull request #9194 from kappa-sama/kappa-sama-keys
...
Wallets can now hold vehicle keys.
2019-08-26 19:37:28 -07:00
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
c069e76304
Merge pull request #9181 from Linzolle/general-swordsky
...
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
ce28e71cd3
2 free ones for anyone that wants them
2019-08-26 17:08:48 -04:00
d43b4599ef
I was bullied to reduce click delay.
2019-08-26 15:53:44 -05:00
13638ed5d6
Reverts some changes I deemed unneccesary. Undoes a fuckup
2019-08-26 15:08:36 -05:00
00c01709b2
moves banners into crafting
2019-08-26 15:46:41 -04:00
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
a4fd2be7f7
Various Shotgun Nerfs.
2019-08-26 14:45:12 -05:00
74a24fdcc1
WHAT IN TARNATION
2019-08-26 14:30:27 -05:00
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
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
d7ec568efc
Allows xeno weeds to regenerate lost blood
...
Honestly this should have been a thing since forever ago but whatever.
2019-08-26 09:08:00 -05:00
44893b6ee7
It just works
2019-08-26 06:32:54 -04:00
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
d64e5b29fd
Update reactions.dm
2019-08-25 15:59:45 -07:00
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
0eb1fdd9dc
Update mood.dm
2019-08-25 11:19:01 -07:00
3e782795dd
get up
2019-08-25 13:14:57 -05:00
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -05:00
955fafee11
make it Work
2019-08-24 23:22:02 -05:00
14ba00d477
shakes my head
2019-08-24 22:21:46 -05:00
9651ae45b1
love to work with merge conflicts
2019-08-24 20:27:47 -05:00
5e94a5db80
ports #44155 from /tg/station
2019-08-24 20:21:44 -05:00
b01f135d3a
addresses a few concerns
2019-08-24 19:09:56 -05:00
4878510c2b
Fixes that make this complie
2019-08-24 19:46:51 -04:00
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
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
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
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
d60ba0a207
Fixes missing DNA info for slimes, resolves virology issues
2019-08-24 04:14:47 -05:00
3fcf9b329f
Update his_grace.dm
2019-08-23 21:46:04 -04:00
20f4e260e1
minigun ooga
2019-08-23 19:39:20 -04:00
3f86a92efa
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
2019-08-23 14:42:35 -04:00
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
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
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
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
kevinz000