124d8503dc
Tests and fixes.
2019-08-29 00:12:16 +01:00
19678119c5
Merge branch 'plasmatables' into plasmaglass-tables-spears
2019-08-28 14:55:01 -06:00
f0a1d44503
Part 1
...
The food brake
2019-08-28 16:54:10 -04:00
9a0b6a21f9
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
...
Amber alert ERTs no longer get pulse weapons
2019-08-28 13:05:56 -05:00
c664032e85
Update supermatter.dm
2019-08-28 02:23:24 -04:00
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
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
0ffeb704af
Socks color fix.
2019-08-28 05:33:36 +02:00
18b023b127
arg
2019-08-28 04:47:53 +02:00
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
e25697dc14
rocket fix.
2019-08-28 03:37:35 +02:00
3b2be43bd8
Slightly increased rubbershot damage from 12.5 to 15 per pellet.
2019-08-27 18:35:08 -05:00
5b4347c5ab
Initial commit.
...
needs to be added alongside all med_hud_set_status and tested to even fukkin' work.
2019-08-27 04:30:31 -05:00
26c5aa6185
Update berries.dm
...
Actually fixes strawberries so they have visible growth stages and death icons.
2019-08-27 03:47:56 -04:00
fd16520ac0
buffs toxinlover blood deletion penalty
2019-08-27 02:42:45 -05:00
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
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
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
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
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
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
62a51d8df5
infinite sword exploit
2019-08-23 01:25:46 -05:00
7a481f4354
TABS
2019-08-23 01:08:53 -05:00
Fermi