Commit Graph
266 Commits
Author SHA1 Message Date
MarmandGitHub b5832cc09e Changeling Headslug Buff + Incubation Changes (#23025)
* cling burger

* slowpoke

* its aliiiive

* cycle it up
2023-11-30 13:44:14 -05:00
HMBGERDOandGitHub 53f6b905e6 customised_abstract_text - removed useless check, changed var (#23282)
* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
2023-11-24 15:36:24 +00:00
5ac1cc817d Fixes a runtime in mind traits and makes IS_HOLY work versus vampires (#23200)
* Fixes mind trait runtime

* DGamerL suggested changes

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Contrabang  suggested changes

* Contra suggestions and improvements

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-20 14:10:04 -05:00
matttheficusandGitHub 7f02b6859d Contractees Now Lose All Implants + 10 Minute Time if Antagonist (#22856)
* i love chaos

* contra review

* contra review 2 or something

* comment fix
2023-11-15 20:40:05 -05:00
91ef8186a2 Further changeling engoodening: chameleon skin buff. (#23233)
* engoodening

* oops

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* fingy print

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* contra review.

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-11-15 19:15:28 +00:00
MarmandGitHub c26462836f zzzzz (#23220) 2023-11-12 20:10:03 +00:00
OctusandGitHub 3adf84254b Update hemomancer_powers.dm (#23204) 2023-11-09 13:24:38 +00:00
AquilarandGitHub 14fbf2b4a9 Adds "Teach them a lesson" Objective (traitor only) (#22933)
* Adds the tech them a lesson objective.

* minor changes

* SPACING!

* onesmallupdate

* requestedchanges

* requestedchanges
2023-11-04 16:30:16 -04:00
ppi13andGitHub abe4110704 Turns isholy into a trait and adds a trait mind helper (#23107)
* Converts isHoly into a trait

* Moves holy from body to mind

* Uncurses the source of curses

* Updates source to roundstart trait

* Contrabang fixes

* Forgot one

* Add trait mind helper

* Request changed Dgamerr/Contra

* Fixes issue

* Nullchecks minds
2023-11-03 20:07:20 +00:00
b2600f7c15 Adds a chat box + bwoink sound to the Admin Message Antagonist Team button (#23078)
* God I love how easy Sean made this

* Update code/modules/antagonists/_common/antag_team.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Replaces sound

* Contra + Lewc review

* Contra review

* Update code/modules/antagonists/_common/antag_team.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-02 21:58:27 -04:00
94b9f85a7c Adds tabs to the cling menu (#22902)
* cling menu

* Update code/modules/antagonists/changeling/changeling_power.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* comment added

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-01 20:11:44 +00:00
e7b396eddf Silicon Chamo properly hides huds (#22312)
* hide hud

* more documentation

* Update code/modules/mob/mob_vars.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/mob/mob_vars.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-11-01 20:10:15 +00:00
357c62b6d7 Ports hitscan from TG, adds it to *SELECT* things (#22754)
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)

* ai turret

* Coca cola, don't forget the ice. Or the pulse

* almost done, pull master than map edit

* we ball

* ah, chasms.

* it's for the best. Fuck should not sleep checker though

* hitscan reflection limiting system

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* c-c-c-changes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-11-01 20:05:27 +00:00
DGamerLandGitHub 49afcce327 Purging the wishgranter (#22976)
* Everything except the map

* Deletes the ruin

* Makes CI not fail

* I pray this fixes it
2023-10-31 18:46:43 +00:00
f8bba47db6 Upscales Changeling DNA Costs (#22901)
* wait what

* 20 not 100

* Another one

* why does it not fucking work

work

* Update code/modules/antagonists/changeling/powers/mutations.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-20 20:11:54 +01:00
aa33cb211a Abstract items can be shown (#22183)
* abstract weapons can be shown

* customised messages, no force visible flag

* forgot this

* Update code/modules/mob/living/carbon/examine.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* return nothing if we want to return nothing

* vortex arm abstract text

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* \n moved to examine code

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-10-20 19:58:51 +01:00
ContrabangandGitHub cf554de96c yeah (#22874) 2023-10-18 22:09:29 -05:00
Farie82andGitHub e6c598e1c1 Ensure the fake death power checks the status again after input (#22943) 2023-10-17 15:27:06 -05:00
ContrabangandGitHub c1441b0b44 wow (#22833) 2023-10-14 20:44:37 +02:00
090ad59cbc Being contracted with a Holopara now kills the holopara (#22832)
* hmm

* Update code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-10-13 14:28:16 +01:00
ContrabangandGitHub ed0cc6cdb4 rev moment (#22819) 2023-10-12 22:21:13 -05:00
a029cf2502 Adds message boxes to the chat system (#22280)
* initial working commit

* fix this

* helpers

* tweaks

* text being silly moment

* antags are red

* Update goon/browserassets/css/browserOutput-dark.css

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/brain/robotic_brain.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* review and warning fixes

* refactor antag greetings

* tweaks to include more things

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/antagonists/traitor/datum_mindslave.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* fixes vial spawned antags

* Update code/datums/mind.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-12 23:15:03 +01:00
6df2c2e3d2 Ghost bar (#22368)
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

* Update code/modules/admin/verbs/debug.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/_onclick/hud/alert.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/cards_ids.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-09 19:47:17 +01:00
ContrabangandGitHub f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
DGamerLandGitHub aae6b003d9 That was fcking easy (#22615) 2023-10-03 17:16:43 +01:00
ContrabangandGitHub 7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374)
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
2023-10-01 14:14:10 +01:00
4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/weaponry.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
7b15c3f60b Fixes projectiles passing through the Desecrated Duel arena (#22588)
* Fixy fixy

* Make it not affect lavaland elites

* Update code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-30 08:26:10 -04:00
GDNandGitHub 97debc25b2 fixes a to_chat runtime (#22646) 2023-09-30 12:58:37 +01:00
59c70f983b Heads/sec/legal can no longer join after revolutionaries have won + Refactor (#22328)
* THE THIRD REV PR

* 2nd time

* final changes

* yea

* fixes

* comments

* oops

* sirryan review

* Update code/game/jobs/job/support.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-25 19:03:25 -04:00
f13586300f pulse demon reopened PR (#21969)
* proof-of-concept implementation

* clear being_hijacked on death

* it glows in the dark

* oops

* machinery interactions and some fixes

* consistency, correctness, fixes

* stop usage of the \the text macro

* list inits in Initialize

* fix control flow spacing

* review compliance

* event code and some tweaks

* upgradable spell abilities and some tweaks

* how did that happen

* cycle cameras spell

* stat upgrades (no sprites for now)

* tweaking

* sounds

* jecties code

* more tweaks and fixes

* some review stuff

* alt-click user param and charger icon fix

* Remove unused default amounts in objectives

* Comply with sirryan review (part 1)

* Move isapc definition

* Add autodoc comments to all pulse_demon vars

* Give random number in name on init

* Fix merge conflicts

* Remove pulse demon from traitors on Destroy

* Fix mulebot relaymove override

* Fix airlock TGUI actions

* Fix loop over mobs in cablehop

* Attempt to fix overload runtime

* Half-fix gun cooldown issue

* Fix chat related issues

* Attempt to fix overload runtime (take 2)

* Make ion projectiles collide

* Tweak pulse demon speed

* Make demon survive loc being deleted

* Send message when saved by self-sustaining

* Fix vv_edit_var for charge

* Stop people disabling hijacked bots

* Make demon lose more health when not on wires

* Increase costs of stat upgrades

* Allow demon to change its drain speed

* Stop demon obliterating xenos

* Comply with review (partial)

* Fix issues pointed out in reviews

* Allow demon to drain charge of reachable items

* Adjust volume of demon sounds

* Improve cell interactions

* Bump up event weight (for testmerge)

* Give pulse demon a highlight section on orbit menu

* Give demon an experimental soft-counter to insuls

* Reduce volume of most common sounds (again)

* Update demon cable overlay when required

* Stop AI using its tracking ability on pulse demons

* Add wizard spawner for pulse demon

* Tweak EMP behaviour and numbers

* Clear references in Destroy

* Make appear on end of round credits even when dead

* Prevent pulse demon from detonating cyborgs

* Generalise insulated structure check

* Clean up remaining review requests

* Add new sprites

* some addressed reviews

* Typepath changes, GC fixes

* I blame charlie

* good enough

* die or something

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* even more changes

* final tweaks

* what

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* bam

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* to_chatn't

* deconflicted

---------

Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-20 16:25:13 +01:00
9a8cc71081 Adds conversion alert for Revolutionaries and Head Revolutionaries (#22321)
* are raging around us

Adds alert for both revolutionaries and head revolutionaries.

* Update code/modules/antagonists/revolutionary/datum_headrev.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-19 21:39:02 +01:00
6144baf737 Adds a new ability to the Gargantua subclass: Desecrated Duel; alongside a small buff (#21858)
* let the wall of errors begin

* alright that's enough for today

* more pain

* only 7 errors

* arena :)

* smaller arena

* slight cleanups

* okay we ask charlie for help tomorrow

* leap works

* okay we ball

* idk I'm just adding this for now

* WE HAVE A CIRCLEEE

* Charge back + timer!

* first steps of the buff

* more cleaning up

* Buff is progressing nicely, almost done

* OKAY WE BALL

* Whoops last things

* whoopsie forgot this

* 20 Stamina damage

* 150 blood now

* WE GOT ANIMATE IN THIS HOUSE

* we be impact immune now

* IT DOESN'T LOOK LIKE SHIT (and goes through walls)

* ok ship it

* Consistency

* I'm buying charlie a bottle of asda rum

* Okay, ready for review

* Henri + Hal reviews

* More reviews + I am stupid

* Charlie review

* Ohhhh so that's why it didn't work

* Yeet this

* Charlie review

* Comment

* Charlie review kinda

* Hal review

* DESECRATED DUEL WOHOOO

* Oops I changed this

* That's one thing done

* Lewc review

* Lewc review part 2

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Lewc review + ICON WOOO

* Aaaaaaa

* TGUI FIXED

* Henri review

* Charlie review

* Charlie review

* Henri review

* Jimkil review

* Update code/__HELPERS/game.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Charlie review

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 16:48:14 +01:00
bb2b6d85fd Fixes some issues with revs (#22308)
* fixes to revs

* Update code/game/objects/items/weapons/implants/implant_mindshield.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* UH OH.

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-10 10:02:16 -05:00
DGamerLandGitHub 03ab6ae4b5 God I hate snowflaking this in (#22318) 2023-09-09 23:11:34 -05:00
ContrabangandGitHub e3eed1d23f Datumizes revolutionaries (#21762)
* holy shit, datumized revs!

* changes to shuttle blocking system

* boom, more shit

* bonk more commits

* convert most in boolean checks to hasantagdatum

* oops, its supposed to be like this

* updates this comment (im making too many commits)

* more changes

* aaaaa moooore changes

* nukes some stuff, makes stuff GC better

* rev victory conditions are checked always on death

* more rev stuff

* oops fucking forgot to push

* i swear to god

* lewcc review

* i forgot this one small bit

* lewc review

* reviews

* comment

* s34n review
2023-09-09 16:12:53 +01:00
2ab351cc91 Sprite updates & state fix for zippo lighters (#22150)
* Update lighter icon state code

This commit adds a new `update_icon_state()` method which updates the
held icon sprite with the appropriate sprite for lit status before
updating the graphic, and drops the use of explicit icon_state
definitions for lit/unlit in favour of consistently named sprites for
lighters.

As no "lit" graphic exists for held zippos, nor sprites for other
custom or base lighters, updating of 'item_state' has been removed which
fixes #21257.

The naming of zippo sprites has been updated to reflect this change and
stay consistent with the base lighter object and sprites.

* Add missing sprites for colored zippos and lit state

This adds copies of the base zippo sprite for spiters to work on when
updating for custom held zippo combinations.

* Adds held sprite references for custom zippos

This change adds in overrides for item_state for zippos that differ from
the base silver model, which include:

* zippo-gold
* zippo-blue
* zippo-black
* zippo-red
* zippo-purple

* Update held item sprite for lighter lit status

* Set parent items file for fluff lighters

* Update zippo sprites with lit and color variations

This commit adds the colorized versions of zippo lighters, as well
as including the lit animation ported over from TG appearances,
with variations applied for Paradise flame colors.

* fixup! Update lighter icon state code

* fixup! Update lighter icon state code

* fixup! Add missing sprites for colored zippos and lit state

* Correct purple held sprite to have blue flame

* Update code/modules/customitems/item_defines.dm

Fixup for ad1b5fb

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: XFirebirdX <xfirebirdx@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-09 13:31:18 +01:00
DGamerLandGitHub 4243f7b0f2 Mmmmmmm I love having no DNA (#22253) 2023-09-07 11:20:58 +01:00
matttheficusandGitHub ea7c3cd892 Adds the Syndicate "Big Brother" Obfuscation Suit (#22151)
* here we go again

* dont feel good about this

* add to contractor kit

* name change

* oops CI moment

* henri review
2023-09-07 10:55:42 +01:00
ContrabangandGitHub 65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681)
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
2023-09-06 17:37:50 +01:00
QwertytofortyandGitHub d727444184 now with REAL GHOST GRABBING ACTION ™️ (#22189) 2023-09-01 23:24:52 +01:00
matttheficusandGitHub acb7352265 Gives Vampires Stronger Night Vision at 500 Blood (#21764)
* I SEEEEEEEEEEEEE YOU

* Hal review part 1

* its time to suck at coding

* right, i think im getting somewhere

* testing shit - doesnt work

* im finally freeeeeeeeeeeeeee

* hal review 2: electric boogaloo
2023-09-01 22:36:40 +01:00
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
c4547e7251 Removes old lines of code mentioning genetic_damage, fixes text misleading to receiving "genetic_damage". (#22068)
* Removes and changes unrequired code and false text

* Update code/modules/antagonists/changeling/datum_changeling.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-08-25 17:04:25 +01:00
matttheficusandGitHub 597835b031 The TC Inflation Act of 2023 - No Balance Changes This Time (#22024)
* its time for me to make Hal cry again

* hal review
2023-08-21 00:20:47 +01:00
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/telesci/gps.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/telesci/gps.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_nuclear.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mod/mod_control.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/mod/modules/module_pathfinder.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
aad8529c24 Removes swiftness, add speed potions back as oil slick potions (#20939)
* Removes swiftness, add speed potions back as oil potions

* no shorting, icon update on mob

* early and forgotten returns

* ramon oil colours

* Update code/modules/research/xenobiology/xenobiology.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* no more slipery vehicles, now slippery tables

* just because it compiled the first time doesn't mean the second list will compile idiot

* icons my hated

* bottle4

* cleaner up

* qwerty my man what you doin: s34n 2023

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 21:07:39 +01:00
DGamerLandGitHub c2f9228988 [s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988)
* The fixes

* Steelslayer review
2023-08-14 20:52:15 -05:00
66374af694 ClingspiderRework Revival (#21435)
* ClingspiderRework Revival

* No sentient pots

* HenriReview

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* ChangesP1

* ChangesFix(I'm dumb)

* Fix(?)

* Revert "ChangesP1"

This reverts commit 91d340dc95.

* lewcc review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* ChangesP2

* GibGib

* Le text

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-12 18:20:19 +01:00
DGamerLandGitHub f6039f9299 Fixes the exploit (#21911) 2023-08-03 22:46:41 -05:00