Commit Graph

1345 Commits

Author SHA1 Message Date
Dip
232cb0cc48 Fix Objectives 2020-12-04 23:10:36 -03:00
QuoteFox
ec3904f134 Merge pull request #738 from MalricB/euthanasia
[MERGE ASAP] fixes bloodsucker burnmod scaling
2020-12-04 19:17:26 +00:00
CygnusB
ae2e3db265 also nerfs stamina regen a fair bit
yeah
2020-12-04 16:13:43 -03:00
CygnusB
f63219fc07 YIKESSSSSSSSSSSSSS
bigggg faaaat yikkkeeeesssss
2020-12-04 16:07:03 -03:00
CygnusB
eff037c632 Delete bloodsucker_coffin.dm
duplicate that for some reason is in the code???
2020-12-04 15:23:39 -03:00
QuoteFox
5c39d03209 Merge pull request #737 from MalricB/euthanasia
quickly fixes and tidies trespass ability for bloodsuckers
2020-12-04 17:15:50 +00:00
CygnusB
6d3e49f11e Updates trespass.dm
fixes a typo, and makes trespass actually work lmao whoops
2020-12-04 14:09:49 -03:00
Dahlular
ede0632fbf Merge pull request #726 from MalricB/euthanasia
Ports vampires. Or, bloodsuckers, rather.
2020-12-03 19:18:47 -07:00
QuoteFox
d481403e92 Merge pull request #728 from ArchieBeepBoop/revenantfix
Makes revenants no longer able to be contaminated by radiation
2020-12-03 22:25:19 +00:00
QuoteFox
2e46f50c33 Merge pull request #735 from ArchieBeepBoop/recipefix
Recipe fix
2020-12-03 22:25:01 +00:00
QuoteFox
015275f99d Merge pull request #733 from CapnMachaddish/numbers-in-names
Allow putting numbers in names
2020-12-03 22:24:40 +00:00
CygnusB
cdba1458a5 THUNK THUNK THUNK 2020-12-03 16:58:42 -03:00
CygnusB
ee7d0389af Update bloodsucker_coffin.dm 2020-12-02 23:40:06 -03:00
Dip
96a6c41923 recipe fix 2020-12-02 22:06:39 -03:00
CygnusB
db72f51d96 adds new sound for lunge, fixes mesmerize mute, weaks abilities 2020-12-02 21:30:57 -03:00
CapnMachaddish
cf0865100f numbers in names 2020-12-02 17:04:22 -06:00
QuoteFox
36d4121e7d Merge pull request #732 from ArchieBeepBoop/neutral
Ports "fixes quirks (again)"
2020-12-02 21:21:57 +00:00
Dip
c5842337f1 Forgot one 2020-12-02 18:18:29 -03:00
QuoteFox
b98cf399c8 Merge pull request #731 from ArchieBeepBoop/neutral
Probably fixes only neutral traits existing
2020-12-02 21:16:46 +00:00
kevinz000
0fa75009fe Merge pull request #10227 from Putnam3145/quirk-fix
Probably fixes only neutral traits existing
2020-12-02 18:14:55 -03:00
QuoteFox
ed8f84b792 Merge pull request #729 from ArchieBeepBoop/crimma
IT CRIMMA
2020-12-02 20:59:42 +00:00
Dip
b79bb10281 poggers 2020-12-02 17:57:07 -03:00
Dip
e47a1d4933 more crimma 2020-12-02 12:10:54 -03:00
Dip
d59deffb43 Makes revenants no longer able to be contaminated by radiation 2020-12-02 12:07:22 -03:00
JaySparrow
4dfc1f6a6a Merge branch 'euthanasia' of https://github.com/Jay-Sparrow/Hyper-Station-13 into euthanasia 2020-12-01 23:33:30 -06:00
JaySparrow
f0f30ae44f Execute vampires
It's all execution
2020-12-01 23:33:27 -06:00
CygnusB
facfe8b168 Merge branch 'euthanasia' into euthanasia 2020-12-02 00:36:07 -03:00
Dahlular
b95a880ed8 Merge pull request #712 from ArchieBeepBoop/oxygencheese
(Hopefully) Prevents supermatter oxygen cheese
2020-12-01 20:14:29 -07:00
Dahlular
02b1aba9d7 Merge pull request #709 from ArchieBeepBoop/blacklistfix1
Re-Porting the Trait Blacklist System (Fixes broken respawn traits)
2020-12-01 20:14:06 -07:00
Dahlular
0d7d215167 Merge pull request #706 from ArchieBeepBoop/speech
Speech options on char customization
2020-12-01 20:13:32 -07:00
CygnusB
e9adea5d9f bsuckers get their objectives and also limits thrallling to 1 per 10 levels 2020-12-01 23:25:37 -03:00
CygnusB
8c56e05f91 Update status_effects.dm 2020-12-01 22:29:20 -03:00
CygnusB
d9c23dafb8 Update bloodsucker_crypt.dm 2020-12-01 20:47:27 -03:00
CygnusB
cd956cae3a dynamic moment 2020-12-01 20:07:26 -03:00
CygnusB
1034c6add0 one punch man 2020-12-01 20:05:48 -03:00
JaySparrow
8df40ba5ce Dynamic blocks
I hope the executes work, because I have tested nothing.
2020-12-01 16:47:00 -06:00
CygnusB
daf30c77e7 Merge pull request #2 from Jay-Sparrow/euthanasia
Syntax
2020-12-01 19:25:11 -03:00
CygnusB
e1c8ee5cd8 Update traits.dm 2020-12-01 19:02:32 -03:00
JaySparrow
9a0e1203f4 Syntax
It compiles so you can test
2020-12-01 15:58:43 -06:00
CygnusB
ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular
ec85829dca Merge pull request #725 from Oposshim/another-nanotrasen-muh-lore-tweak
Posshim's fix - of a fix - of a fix - of a fix
2020-11-30 09:49:21 -07:00
Oposshim
c8cf5e2fb7 Posshim's fix - of a fix - of a fix - of a fix
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
2020-11-30 11:30:55 -05:00
QuoteFox
5e96e1dc61 Admin help now sends to discord.
Adminhelp now sends to hyperstation discord. and some fixes to rejected, to make it sound less passive aggresive.
2020-11-30 13:59:29 +00:00
QuoteFox
6f01e83714 Merge pull request #718 from ArchieBeepBoop/wizardlizard
Allows the wizard to load their current character's appearance
2020-11-30 00:00:25 +00:00
QuoteFox
e1e8ce795d Merge pull request #723 from ArchieBeepBoop/lighteater
Fixes an inconsistency with the light eater and marker beacons
2020-11-30 00:00:01 +00:00
QuoteFox
60d39b5c03 Merge pull request #722 from ArchieBeepBoop/newfixes
2 Minor typos
2020-11-29 23:59:43 +00:00
QuoteFox
8437a3e472 Merge pull request #719 from TotallyNotADog/cleanNadeFix
fixes cleaner grenades hissing whenever they come into existence
2020-11-28 09:34:12 +00:00
Dahlular
29d35a5645 Merge pull request #721 from ArchieBeepBoop/rld
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 13:54:58 -07:00
Dip
4d197db9ea a 2020-11-27 16:03:45 -03:00
Dip
6057e3036e change costs 2020-11-27 16:01:59 -03:00