Commit Graph
14833 Commits
Author SHA1 Message Date
Sishen c664032e85 Update supermatter.dm 2019-08-28 02:23:24 -04:00
nik707andGitHub 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
kevinz000andGitHub bea4349056 Merge pull request #9180 from deathride58/buffspoly
grants poly the ability to automatically speak through the TGS relay (with a 0.01% chance)
2019-08-27 20:50:59 -07:00
Ghommie 0ffeb704af Socks color fix. 2019-08-28 05:33:36 +02:00
Ghommie 18b023b127 arg 2019-08-28 04:47:53 +02:00
BlackMajorandGitHub 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
Ghommie e25697dc14 rocket fix. 2019-08-28 03:37:35 +02:00
Tupinambis 3b2be43bd8 Slightly increased rubbershot damage from 12.5 to 15 per pellet. 2019-08-27 18:35:08 -05:00
TrilbyspacecloneandGitHub 6cf4783486 fixed 2019-08-27 13:56:47 -04:00
TrilbyspacecloneandGitHub 77863119f2 Update wallets.dm 2019-08-27 11:31:52 -04:00
Winter Flare 26c5aa6185 Update berries.dm
Actually fixes strawberries so they have visible growth stages and death icons.
2019-08-27 03:47:56 -04:00
kevinz000andGitHub 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
kevinz000andGitHub 78c1ad972f Merge pull request #9179 from chefferz/master
Gives His Grace stamina regeneration
2019-08-26 19:39:46 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 96278b45ad Merge pull request #9183 from Ghommie/Ghommie-cit187
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-26 19:36:06 -07:00
kevinz000andGitHub 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
kevinz000andGitHub d64e5b29fd Update reactions.dm 2019-08-25 15:59:45 -07:00
Sishen b093439c73 aaaaaaaa 2019-08-25 16:27:02 -04:00
kappa-samaandGitHub 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
chefferzandGitHub 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
chefferzandGitHub 0f4f20c29a Update buffs.dm 2019-08-23 03:50:28 -04:00
chefferzandGitHub 788d616c76 Update his_grace.dm 2019-08-23 03:47:21 -04:00
chefferzandGitHub bd1dae9082 Update buffs.dm 2019-08-23 03:46:13 -04:00
chefferzandGitHub 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
chefferzandGitHub 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
chefferzandGitHub 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
lolman360andGitHub c618ce114d Ebb 2019-08-22 14:18:49 +10:00
lolman360andGitHub 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
kevinz000andGitHub 2f9ca28d38 this is bad performance and probably unnecessary but juuust in case.. 2019-08-21 08:17:34 -07:00
kevinz000andGitHub 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
kevinz000andGitHub ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
2019-08-21 08:15:08 -07:00
kevinz000andGitHub 7fe2d2b5f2 Merge pull request #9142 from Trilbyspaceclone/patch-211
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
kevinz000andGitHub 3f6256d945 Update all_nodes.dm 2019-08-21 08:06:08 -07:00
kevinz000andGitHub 3c59b43ff7 Update shotgun.dm 2019-08-21 06:39:18 -07:00