Commit Graph

93 Commits

Author SHA1 Message Date
CapnMachaddish
157c3722ac no longer shitcode 2021-01-12 00:59:24 -06:00
Ghom
bfe9fa745c Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2021-01-09 15:35:32 -03:00
Archie
ee25835e3d I am stupid 2021-01-08 21:27:50 -03:00
Archie
2b9eec42e7 Traitorfix 2021-01-08 21:10:56 -03:00
Archie
c164b52b30 Merge remote-tracking branch 'upstream/master' into nexties2 2021-01-08 15:20:47 -03:00
Archie
78da9a5a12 Merge branch, update to current 2021-01-08 07:26:35 -03:00
kevinz000
939d8258de Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
Putnam3145
66a9ce77fb Merge pull request #9964 from GrayRachnid/fixmyblunder
Fixes Codewords not changing color and MkUltra enthrall not having the proper hearing_args
2021-01-06 22:14:03 -03:00
BlackMajor
02cb328921 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -03:00
BlackMajor
4b8b03fea0 Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled. 2021-01-05 16:32:02 -03:00
Archie
9e37d3be62 Fix merge conflicts 2021-01-05 03:41:08 -03:00
Lin
b0779fe2d7 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2021-01-05 01:34:16 -03:00
Ghom
291dcf9515 Merge pull request #10575 from Arturlang/TGUIs_Nexties
[TESTMERGE] Properly working TGUI Next
2021-01-04 19:47:54 -03:00
Lin
5dd1bc07c6 Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly 2021-01-04 02:36:28 -03:00
kevinz000
8e51c88d0e Porting Robustin's Syndicate Infiltrator PR from tee-gee 2021-01-02 16:53:52 -03:00
Chloe Carver-Brown
c2a937bb73 Changing Nanotrasen to Kinaris where needed 2020-12-31 17:58:25 +00:00
Archie
5710e12cb5 Surgery ports 1 2020-12-27 04:25:28 -03:00
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