3180 Commits

Author SHA1 Message Date
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
Lin 9677bb5104 Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
2020-12-02 00:57:14 -03: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
Dip bcd3df5bd4 Inconsistency with the light eater and marker beacons 2020-11-27 15:23:35 -03:00
Dip 7f7dd54b86 Typos 2020-11-27 15:01:34 -03:00
Ghom 6502fe255f Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 14:44:26 -03:00
Dahlular 238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
TotallyNotADog f9137afb8a replace glass with plastic 2020-11-25 16:01:13 -06:00
QuoteFox 27e09f2340 Merge pull request #710 from ArchieBeepBoop/38
Bluespace launchpad QoL + Mistakes
2020-11-25 04:21:32 +00:00
Dip 3ec5e4205e Allows the wizard to load their current character's appearance. 2020-11-23 19:51:43 -03:00
DragonTrance 536d0db119 stupid mobile fat fingered 2020-11-22 17:36:35 -07:00
DragonTrance f9488ea660 5 2020-11-22 14:23:38 -07:00
DragonTrance 274f49531f 4 2020-11-22 14:22:38 -07:00
DragonTrance 5d2afad223 3 2020-11-22 14:21:42 -07:00
DragonTrance a297b6f05c 2 2020-11-22 14:14:50 -07:00
DragonTrance 3042f9df69 i am literally hand-writing these on my phone from my computer because of my lack of internet 2020-11-22 14:06:52 -07:00
Dip 14f6a69242 Prevents supermatter oxygen cheese 2020-11-22 17:44:12 -03:00
Dip 9d3f5fd445 These are not the same. 2020-11-22 15:10:58 -03:00
Dip b6a8286e4f Resonance Cascade supermatter delamination event + SM beam graphics update 2020-11-22 14:47:12 -03:00
Poss e40871a123 Update lavaland_ruin_code.dm 2020-11-22 10:24:19 -05:00
BlackMajor 3637fb2c1b Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122
Bluespace launchpad QoL (read: powercreep)
2020-11-22 06:04:23 -03:00
kevinz000 4c02f20812 reorganizing 2020-11-22 06:03:48 -03:00
Dip 8bde734e7a embiggen blacklist 2020-11-22 05:51:25 -03:00
Dahlular ea1a66fd8b Merge pull request #698 from ArchieBeepBoop/hev
HEV Suit Mk.I
2020-11-22 01:36:12 -07:00