Commit Graph

76 Commits

Author SHA1 Message Date
Archie 838c20c200 Merge remote-tracking branch 'upstream/master' into reagentsagain 2020-12-09 14:32:55 -03:00
Lin a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Archie 786b1f4506 Fixing minor issues 2020-12-06 22:25:14 -03:00
Archie 80ac5e46a4 shitcode™️ 2020-12-06 21:13:21 -03:00
Dahlular 424e4b1b3d Merge pull request #746 from ArchieBeepBoop/basement
Fixes everyone looking like a basement dweller (Pale Skin)
2020-12-06 13:34:49 -07:00
Dahlular 752fa3ab5e Merge pull request #745 from ArchieBeepBoop/youstolemyheart
Fixes the bloodsucker heart acquisition objective. Heart wrenching.
2020-12-06 13:34:27 -07:00
Dahlular d5a06e2471 Merge pull request #744 from MalricB/euthanasia
Makes bloodsuckers get thralls every 5 levels instead of 10 + nerfs thrall recuperate (also points stakes.dm to the right path)
2020-12-06 13:33:55 -07:00
Dip ff1f6afc1a Fixes everyone looking like a basement dweller 2020-12-06 13:03:09 -03:00
CygnusB 42d141258e Update bloodsucker_stake.dm
whoops
2020-12-05 20:05:54 -03:00
Dip 82ca244c1b You stole my heart 2020-12-05 14:24:10 -03:00
CygnusB 5a4cd0709b thralls recuperate costs more + vassals every 5 levels
whoops
2020-12-05 14:22:59 -03:00
Dip a107eda398 brokem 2020-12-05 03:18:58 -03:00
Dahlular 845d5f3dac Merge pull request #742 from ArchieBeepBoop/objectives
Fixes bloodsucker roundstart objectives, adds a better objective proc that fixes issues with certain antags not getting their objectives at roundstart
2020-12-04 19:15:27 -07:00
Dahlular 761fba894a Merge pull request #741 from MalricB/euthanasia
Tweaks bloodsucker thrall conversion cost
2020-12-04 19:14:11 -07:00
Dip 232cb0cc48 Fix Objectives 2020-12-04 23:10:36 -03:00
CygnusB 6482f4182a Update bloodsucker_crypt.dm 2020-12-04 22:37:40 -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
CygnusB ee7d0389af Update bloodsucker_coffin.dm 2020-12-02 23:40:06 -03:00
CygnusB db72f51d96 adds new sound for lunge, fixes mesmerize mute, weaks abilities 2020-12-02 21:30:57 -03:00
Dip d59deffb43 Makes revenants no longer able to be contaminated by radiation 2020-12-02 12:07:22 -03: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 d9c23dafb8 Update bloodsucker_crypt.dm 2020-12-01 20:47:27 -03:00
CygnusB 1034c6add0 one punch man 2020-12-01 20:05:48 -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
Dip 3ec5e4205e Allows the wizard to load their current character's appearance. 2020-11-23 19:51:43 -03:00
kevinz000 4bd370532d Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2020-11-12 03:53:27 -03:00
kevinz000 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2020-11-03 01:51:18 -03:00
Dip 2713df2455 makes revenants less shit tm 2020-11-01 22:15:41 -03:00
kevinz000 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259
Porting GetComponent macros removal, and few other updates.
2020-10-27 14:42:55 -03:00
Dip 9b7eee0a89 merge conflict 2020-10-18 16:54:22 -03:00
Dahlular 441f1cd449 Merge pull request #600 from Jay-Sparrow/Dynamic2
More dynamic
2020-10-18 13:22:15 -06:00
Dip 6163b7c963 GRUG SMASH RUNTIME 2020-10-18 04:34:21 -03:00
Dip c91a106b0d fixes and runtimes 2020-10-17 23:55:40 -03:00
deathride58 cc26593463 Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2020-10-17 22:25:16 -03:00
JaySparrow c3d33c363c Nukies
fix da nukie
2020-10-16 19:10:28 -05:00
Dahlular 688617d631 Merge pull request #589 from ArchieBeepBoop/interfacefix2
No ID Insertion, Fire Alarms Fix, ORM Fix, Sleeper Reagent Upgrade, Volume Based Filters, 5x5 SM Fix (THE FIXENING™)
2020-10-13 00:21:59 -06:00
Lin e0d9a3b354 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2020-10-12 23:47:58 -03:00
JaySparrow e536168d4f Changeling Fix
Size and clothesplosion
2020-10-12 18:04:56 -05:00
Dahlular 12bf86ed76 Merge pull request #561 from ArchieBeepBoop/patch
Eldritch Affairs Patch
2020-10-07 19:34:19 -06:00
Dip aea562bbe9 Eldritch Affairs Patch 2020-10-07 05:50:53 -03:00
Dip aa7d47a23b Examine Code Refactor 2020-10-06 23:36:21 -03:00
kevinz000 b8bc551d51 Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2020-10-03 19:35:47 -03:00
Lin ac25b449f7 Merge pull request #9856 from Ghommie/Ghommie-cit367 2020-10-02 00:49:56 -03:00