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
9a32d437a5
grants poly the ability to speak through the TGS relay (with a 0.01% chance)
2019-08-22 20:33:12 -04:00
e6dbaf8473
this should work
2019-08-22 13:02:01 -04:00
c618ce114d
Ebb
2019-08-22 14:18:49 +10:00
ea9eaedf1a
Ports BeeStation/BeeStation-Hornet#345
2019-08-21 22:16:44 -04:00
2f9ca28d38
this is bad performance and probably unnecessary but juuust in case..
2019-08-21 08:17:34 -07:00
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
7fe2d2b5f2
Merge pull request #9142 from Trilbyspaceclone/patch-211
...
removes glue from nukies/clownops uplinks
2019-08-21 08:11:44 -07:00
3f6256d945
Update all_nodes.dm
2019-08-21 08:06:08 -07:00
3c59b43ff7
Update shotgun.dm
2019-08-21 06:39:18 -07:00
32c7a7c3ee
Virology's broken as fuck, damnifino why
2019-08-21 03:36:40 -05:00
b29607c019
It's working again, I guess. wtf
2019-08-21 01:36:59 -05:00
2f39bb3d56
Update necropolis_chests.dm
2019-08-20 21:59:50 -07:00
c694248f5a
Update necropolis_chests.dm
2019-08-20 21:58:48 -07:00
23333f6ea5
reverts the majority of clean act because it doesn't work properly otherwise
2019-08-20 23:03:31 -05:00
044ef51dfa
Relies on a PR
2019-08-20 18:32:39 -04:00
bda3ac8745
blood dna is fixed, your ERP code is too
2019-08-20 07:41:50 -05:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
kevinz000