kevinz000
78c1ad972f
Merge pull request #9179 from chefferz/master
...
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
kevinz000
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
kevinz000
96278b45ad
Merge pull request #9183 from Ghommie/Ghommie-cit187
...
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000
c069e76304
Merge pull request #9181 from Linzolle/general-swordsky
...
[SPEEDMERGE] fixes sword exploit and secbot construction
2019-08-26 19:35:51 -07:00
Tupinambis
d43b4599ef
I was bullied to reduce click delay.
2019-08-26 15:53:44 -05:00
Tupinambis
13638ed5d6
Reverts some changes I deemed unneccesary. Undoes a fuckup
2019-08-26 15:08:36 -05:00
Tupinambis
a4fd2be7f7
Various Shotgun Nerfs.
2019-08-26 14:45:12 -05:00
Dap
f104ba1f90
Plasmaglass Spears and plasmaglass actually drops plasma shards!
2019-08-25 21:38:04 -06:00
kevinz000
d64e5b29fd
Update reactions.dm
2019-08-25 15:59:45 -07:00
Sishen
b093439c73
aaaaaaaa
2019-08-25 16:27:02 -04:00
kappa-sama
036115eddb
wallets can hold keys
2019-08-25 15:45:47 -04:00
Poojawa
1ba9d374fe
whatever, I guess
2019-08-25 01:19:16 -05:00
Poojawa
b01f135d3a
addresses a few concerns
2019-08-24 19:09:56 -05: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
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
Ghommie
2ce01b3bda
Removes an obnoxious temporary overlay var.
2019-08-23 19:57:57 +02:00
Ghommie
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
chefferz
0f4f20c29a
Update buffs.dm
2019-08-23 03:50:28 -04:00
chefferz
788d616c76
Update his_grace.dm
2019-08-23 03:47:21 -04:00
chefferz
bd1dae9082
Update buffs.dm
2019-08-23 03:46:13 -04:00
chefferz
580ea38199
Update buffs.dm
2019-08-23 03:45:44 -04:00
Linzolle
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
Linzolle
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
chefferz
de4d4a990b
Updated weight class
...
Updated weight class per Bhjin's suggestion
2019-08-22 21:07:31 -04:00
deathride58
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -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
JTGSZ
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
lolman360
c618ce114d
Ebb
2019-08-22 14:18:49 +10:00
lolman360
70581af613
Epic recipie moment.
2019-08-22 14:17:11 +10:00
deathride58
ea9eaedf1a
Ports BeeStation/BeeStation-Hornet#345
2019-08-21 22:16:44 -04:00
kevinz000
2f9ca28d38
this is bad performance and probably unnecessary but juuust in case..
2019-08-21 08:17:34 -07:00
kevinz000
25a7d3af51
Merge pull request #8968 from Trilbyspaceclone/patch-199
...
Fixes dead/used face huggers from still infecting
2019-08-21 08:16:06 -07:00
kevinz000
ba2a6d6626
Merge pull request #9145 from Trilbyspaceclone/patch-212
...
gives drones a RPD
2019-08-21 08:15:08 -07:00
kevinz000
7fe2d2b5f2
Merge pull request #9142 from Trilbyspaceclone/patch-211
...
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
kevinz000
3f6256d945
Update all_nodes.dm
2019-08-21 08:06:08 -07:00
kevinz000
3c59b43ff7
Update shotgun.dm
2019-08-21 06:39:18 -07:00
kevinz000
2f39bb3d56
Update necropolis_chests.dm
2019-08-20 21:59:50 -07:00
kevinz000
c694248f5a
Update necropolis_chests.dm
2019-08-20 21:58:48 -07:00
Seris02
4fbbed3a43
adds looc hotkey
2019-08-20 14:32:48 +08:00
Sishen
7a8e2c3f50
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
2019-08-19 17:54:16 -04:00
Code-Cygnet
d6c9daa4eb
Update drinks_recipes.dm
...
Fixed more errors, spelling and id errors to be exact with the help of Papa Pax :D.
2019-08-19 16:04:16 -04:00
Code-Cygnet
e7d08d1fed
Update drinks_recipes.dm
...
Fixed error at line 803, allies_cocktail to alliescocktail. Am bone-head :(.
2019-08-19 15:53:13 -04:00
Code-Cygnet
167b18d045
Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
...
Error spotted at 2138 and fixed by Sishen, aka Papa Pax!
Co-Authored-By: Sishen1542 <sishen1542@gmail.com >
2019-08-19 15:28:51 -04:00
Sishen
ed2c3f3cbd
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
2019-08-19 13:53:05 -04:00
TrilbySpaceClone
6c6391b4c4
Merge branch 'master' into fruit
2019-08-19 07:37:12 -04:00
Trilbyspaceclone
cce33ec7e5
Update drink_reagents.dm
2019-08-19 07:17:57 -04:00
Trilbyspaceclone
d1404a84d8
Update backpack.dm
2019-08-19 07:03:54 -04:00
BlackMajor
dbe50db261
Merge pull request #8349 from Trilbyspaceclone/patch-124
...
Removes Nitryl bounty but adds 7 more in!
2019-08-19 20:07:40 +12:00
