Commit Graph

156 Commits

Author SHA1 Message Date
PollardTheDragon
fca03efeb0 Exfiltration - Early Antag Escape (#29554)
* Ghost bar antag addition

* Adds extraction flares and extraction procs

* Ghostbarification, antag-specific extractions

* Objectives reroll if target extracts

* Comment format

* Adds blackboxing. Prevents extraction if you're an objective target.

* Fixed objective freezing, removes mindslaves on exfiltration

* Vampire Portal Sprites

* Better sprite for portal

* Flayer telepad, assorted visual adjustments

* Makes flayer and vampire portals truly one time use. Flayer ability icon

* Fixed indents, vampire ability icon

* Changeling flare

* Removed some debug adjustments

* Map fixes

* Makes the exfil restriction a var on the datum

* More map fixes

* Centcomm my beloathed

* More map fixes

* Checks delay before objectives

* Objective freezing list fix

* Review fixes

* Moves a lot of exfil item granting logic to antag datum.

* Changed objective exfil block from var to proc

* Centcommmm

* Adds true return. Thanks Contra.

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

* Efficiency

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

* Moved jaunter subtypes

* Forgot to move the admin one

* Capitalization

Co-authored-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Reworked area selection

* Black box, admin log, proper clearing of martial arts and bio chips

* Exfiltration now properly checks completion of alive and free escape objective

* Adds announcement to security comms when exfil item is used

* Linters

* Map adjustments

* Fixes syndiebar library computer access

* Merge conflict resolution

* Updates action buttons

* New Linters

* Update centcomm.dmm

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
2025-09-09 01:28:09 +00:00
YoursTrulyHollow
072bebd088 Drip expansion: Syndicate garment bag (#29764)
* repair droid sprite update

* biochips

* syndie drip 1

* Update code/game/objects/items/weapons/storage/garment.dm

Indeed, my apologies

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/glasses/glasses.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/glasses/glasses.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/head/beret.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/neck/cloaks.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* merge conflict resolve attempt 1

* Merge conflict resolve attempt 2

* mergre conflict RESOLUTION attempt 3

* Revert "mergre conflict RESOLUTION attempt 3"

This reverts commit 06e0f77564.

* Merge conflict resolution attempt 4: hooks edition

* maybe i shouldn't have commented that one thing out

* updated garment bag description, removed stashed change

* removed garment bag contents stashed changes

* removed syndie beret stashed changes

* removed syndie cloak stashed changes

* fixing my fuckup part 1

* fixing my shit part 2

* fixing my shit part 3

* fixing my shit part 4

---------

Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-08-02 05:27:06 +00:00
PollardTheDragon
06f19cdecb Adds Clown Car, Ports TG Vehicle Code (#29529)
* WIP - Clown Car, Bugged key insert, buckle, driver can't drive

* WIP - Needs Movement, Testing

* Compiles

* Sealed port

* Car

* Clown Car Cannon

* Formats for comments

* Linters

* Linters again

* Linters

* Attack chains

* Dump mobs on supermatter dust, instead of dusting everything

* Supermatter bump change for clown car

* Headlights fix

* Fixes runechat for car, fixes opening trunk do-after, removed excess code

* Another do-after fix

* Fixed squishing prone people, fixed buckle bug

* Better trait handling, fixes some silicon issues

* Fixes emergency lube foam

* Fixes AI getting nullspaced on eject

* Fixes hands remaining bound when ejected after using cannon mode, fixes cannon mode, adds var-editable thing

* Updated clown car actions

* Update code/modules/vehicle/tg_vehicles/cars/clowncar.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-07-29 23:05:06 +00:00
PopeDaveThe3th
6dff434902 Ports TGMC Pistol + Pistol Magazine + Attachment Sprites (#29768)
* let's fuckin go

* aps cleanup

* one word

* attachments file

* license nonsense

* almost forgor

* error fix

* second fix

* please free me from this hell

* AHHHHHHHHHHHHHHH

* please just end already

* please

* for fuck's sake

* just work already you little shit

* FUCK

* the suffering does not end

* there can't be many more

* license

* rollback 1

* rollback 2

* license move

* Update code/modules/projectiles/ammunition/magazines.dm

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

* contra change

* rollback

* contra change 2.0

* Update README.md

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

* Update code/modules/projectiles/guns/projectile/automatic.dm

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

* Update code/modules/projectiles/guns/syringe_gun.dm

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

* more contra changes

* whoops

* daedalus

* few more

* Update code/modules/projectiles/guns/projectile/automatic.dm

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

* more contra edits

* Update code/modules/projectiles/guns/projectile/sniper.dm

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

* that was annoying

* Update code/modules/projectiles/ammunition/magazines.dm

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2025-07-29 22:30:45 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
kyunkyunkyun
75202c986e Fix and refactor of chainsaws (#28893)
* code improvements

* linters

* oh

* Update spellblade.dm

* Update spellblade.dm

* Update melee.dm

* melee's death

* update paths

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

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

* fix icon states

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-07-23 17:32:47 +00:00
AmityBlamity
98a0cf9434 Spelling and grammar fixes for Syndicate item descriptions (#29469)
* Spelling and grammar fixes for descriptions in uplink_traitor.dm

* Minor spelling/grammar/Britishism fixes in uplink_nuclear.dm
2025-06-18 19:54:09 +00:00
AmityBlamity
7370bea35a Syndicate was incorrectly spelled as Sydnicate - Thanks Coathangerarecool! (#29468) 2025-06-07 14:07:03 +00:00
AmityBlamity
caddddc287 A round of spelling/grammar fixes for uplink_general.dm (#29470)
* A round of spelling/grammar fixes for uplink_general.dm

* Fixes suggested by BiancaWilkson
2025-06-07 14:05:38 +00:00
PollardTheDragon
bc2454461b Makes Mantis Blades Cheaper (#29048) 2025-05-13 04:53:35 +00:00
CRUNCH
2b229b6fef Update uplink_general.dm (#29069) 2025-04-26 18:16:50 +00:00
PollardTheDragon
c6c4e82ff4 Bulldog for Traitors (#28592)
* Bulldog for Traitors

* Adds chat message when you try to load ammo that doesn't fit in the magazine.
2025-03-25 11:11:49 +00:00
Ahzpy
b2e463444e Adds contortionist's envirosuit (Plasmaman contortionist's) (#28481)
* plasma in the vents (not literally)

* oops i pressed a random button while typing

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

* formatting

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

* Update code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm

not sure what this is, code is copied from original contortionist's. might be worth fixing

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

* false and true

0 to false and 1 to true

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

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-15 08:57:19 +00:00
Burzah
afe9953628 oops (#28630) 2025-03-09 15:57:09 +00:00
PopeDaveThe3th
bd132853f6 boolet (#28445) 2025-03-01 03:31:15 +00:00
Burzah
ff4277d5e3 Removes command from being eligible for round start antagonist (#28173)
* Off with the heads

* Apply suggestions from code review

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

* Actually adds the restrictions to dynamic

* Makes telegun hijack only for scientist

* Update code/game/gamemodes/cult/cult_mode.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-02-11 11:40:44 +00:00
PopeDaveThe3th
4bdd8a06ba [LORE] Bluespace Lore Pass Pt. 1 (#27809)
* when the space is blue

* Update bio_chip_fluff.dm

* Update wormhole_jaunter.dm

* Update magazines.dm

* Update bags.dm

* Update magazines.dm

* Update dance_machine.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update closets.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-01-23 05:21:16 +00:00
Burzah
54e5102d04 nerf bat (#28030) 2025-01-21 14:45:01 +00:00
Mira
dac57002ff [PORT] Add mantis blades (new traitor item) (#27594)
* add mantis blades

* fix nuclear only

* fix .dme edit

* fix linter

* new attack chain

* maybe fix linter

* add NT mantis blade to syndicate 6

* newline

* add list

* fix nested types

* ability to pry open doors with two blades

* Update code/game/machinery/doors/airlock.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* requested changes

* remove transform

* replace sleep with addtimer

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/uplink_kits.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* add safetys and some cleanup

* return parry sound

* snake case and replace CALLBACK with VARSET_CALLBACK

* move attacking logic and update item and uplink description

* cleanup

* first attempt

* fix conditional statement

* update paradise.dme

* edit whitespace

* signal interceptors

* improve some logic

* oops

* use COMSIG_INTERACTING

* return one whitespace

* subtype for mantis blades

* replace .GetComponent() with signal

* fix typo

* better naming

* attempt_cancel_message and some logic

* split logic

---------

Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
2025-01-17 18:16:59 +00:00
Drsmail
53f302bad4 Updates spring lock description to better indicate activation method (#27861)
* Better Description

* Better Description

* Deletes excessive \n

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
2025-01-08 21:24:18 +00:00
1080pCat
f740a7771a Makes the power biochip more normal to use, and makes it use TG cool downs. (#27781)
* Makes the shock implant more normal to use, and makes it use TG cooldowns

* i forgot uplink descriptions

* contrabang review

* comment clean
2025-01-06 16:30:26 +00:00
warriorstar-orion
0ffa8303a7 Rename all non-snake_case types. (#27268)
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
2024-11-30 19:08:45 +00:00
Drsmail
5656f3409a [FEATURE] New chameleon pen for forging [signs] (#27128)
* Added a new item - Chameleon pen for Forging signatures and also made a new kit with it and chameleon stamp

* Fixed shorted nemes and replaced spaces with tabs (I hope)

* Last space fixed

* Apply suggestions from code review

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

* Chameleon pen now have same discription as a regular pen, also retested evrething again.

* Apply suggestions from code review and the one i missed by mistake

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

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/datums/uplink_items/uplink_general.dm

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

* changed the cost. Added proper logs. Adjacency checks

* removed duplicated code

* Applied suggested changes from code review

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-27 05:16:52 +00:00
SchrodingersWolf
3d06cd6e47 Improves the Dark Gygax Slightly (#27378)
* The Dark Gygax is coming for you

* False advertising is bad

* Guh, thanks Beagle

Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Signed-off-by: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com>

* I CAN FLY

* Applied code suggestion from DGamerL

---------

Signed-off-by: SchrodingersWolf <108938550+SchrodingersWolf@users.noreply.github.com>
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
2024-11-24 21:34:54 +00:00
Contrabang
aa2651f659 Unfucks Bulldog Bundles (#27376) 2024-11-24 20:04:40 +00:00
Henri215
b38c4bbd4c A few description grammar fixes (#27134)
* Double spaces

* more space and misspelling

* Fixing punctuations

* Not now

* double dots

* Apply suggestions from code review

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-10 13:38:28 +00:00
Qwertytoforty
2ff00f1e5f makes pda bombs not lie to you (#27303)
* makes pda bombs not lie to you

* Update code/datums/uplink_items/uplink_traitor.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-11-07 18:41:58 +00:00
datlo
b7f0987101 Tweaks syndicate MMI and cyborg console interactions (#27041)
* Tweak syndicate MMI and cyborg console interaction

* tweak action icon

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* Apply suggestions from code review

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-10-23 17:39:43 +00:00
Сиротка
551eb8ee76 TWEAK: Love pen now higly peaceful (#26995)
* TWEAK: Love pen now higly peaceful

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-10-22 09:26:36 +00:00
Contrabang
900271af91 Updates OD lints (#26729)
* yea

* update lints

* lint changes and code fixes

* i hate old code

* dont make this an error
2024-09-27 17:02:16 +00:00
1080pCat
a56b96b4d7 Nukies can no longer buy the chainsaw (#26627) 2024-09-25 23:40:44 +00:00
DGamerL
e3c73110db Adds Chemical flamethrowers (#25091)
* Initial work

* Good enough to open a PR out of draft

* Make these use the vars on the flamethrower

* Moar fixes

* Undefines define

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

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

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

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

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

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

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

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

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

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

* This won't compile

* GDN review

* Fixes CI

* Fixes CI even more

* 5 ammo per tile now

* Heavily nerfs adding multiple fires

* Adds phlogiston as a burnable reagent

* Fixes the fire name

* Placeholder sprite + ammo use fix

* Now in cargo partially

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Lewc Review

* Adds nuclear variant

* Adds the chem flamethrower to the nukie uplink, alongside ammo

* More fire armor tweaks

* GDN review

* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* TEMPORARY PUSH

* Adds inhands

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

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

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

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

* Fixes inhands

* Makes air hot again

* Lewc review

* Audible messages and canister refilling

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-05 23:12:56 +00:00
PollardTheDragon
2d94ff16f4 Getting Medieval - Breach Cleaver (#26298)
* Securiblade, Sheaths

* Snakesfang and Cleaver

* Crates and Armory

* Origin Tech Fix

* Chargers can now accept securiblades

* Clan Cleaver is now Breach Cleaver

* Armor Checking

* Comment and description fixes

* State comment

* More Comments

* Contains list fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Breacher sword hates doors

* Tab indentation

* Breacher Armor Buff - Status Effect while wielding

* Breach Cleaver Sounds - courtesy of Stoniest

* Snakesfang Codersprites

* Define Fix

* Breach Cleaver - Icon Codersprites

* Breach Cleaver Codersprites

* Gave help-intent attack on cleaver an animation

* Reduced sound intensity of wielded harm

* Moved variables below inherits

* Buff spacing, guard clause

* Improved examine

* Guard clauses the secsword powercell

* Sword mode defines

* Added undefs

* Spacing

* Securiblade loreful examine_more

* Examine_More for all swords

* Grammar

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

* Moved defines, added auto-docs, grammar

* Fixed secsword recharging

* Secsword burn function fix

* Cleaver Armor Buff Fix

* Fix to buff

* Securiblade burn fix, stamina charge reduction fix

* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed

* Fixes securiblade EMP oversight

* Snakesfang can parry now

* Spelling

* Removed define indents

* Early returns

* A whole lot of fixes. Qdels the cell on delete.

* stun_delay proc doc

* Update code/datums/uplink_items/uplink_general.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Merged IF statements, relocated inits

* Armor change

* Remove null in cell variable

* Ifs to Switch

* Revert "Armor change"

This reverts commit 6b61e33433.

* Better Ifs to Switch

* Removes roundstart armory blade, increases crate cost to 550

* Removed extraneous loc check, removed extraneous link cell proc

* Added null check to secsword/emp_act

* Added clear_cell proc to replace duplicate icon updates and cell nulls

* No vars in proc argument

* Properly nulls cell. Fixes cell sabotage for sword

* JustTheCleaver

* Forgot about the recharger

* Logic Change - Combined two Ifs

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

* Removed  extraneous permit var

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

* Early returns on object attacks

* Fixed missing cleaver sheath

* Fixed comment format

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Removed extraneous line

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

* cleaving_armor_boost variable standardization

* Added intent and effects to attack logs

* Added notice to description span for antags

* Made the armor buff into a var

* Replaced get_dir(src, get_step away(H, src) with user.src

* Fixed stat check

* AP Changes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-08-09 01:03:47 +00:00
DGamerL
7b151850d4 Makes surpluses spawn items again (#26411) 2024-08-06 20:40:40 +00:00
DGamerL
319a3d0bf6 Adds hijack items back to the uplink (#26390) 2024-08-04 16:53:59 +00:00
PollardTheDragon
88fbe41208 Allows Job and Species specific items to roll discounts (#25915)
* Job and Species Discounts

* Condensed procs

* No His Grace discounts

* Better crates, no discounts for 10 TC or lower

* Removes extraneous bits

* Removed excess null, fixed out-of-scope discount floor change

* Documentation, null check, and a lot of snakes

* Reworked logic of where it does job/species checks

* Curly brackets begone

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

* Curly brackets begone pt2

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

* Removed for loops in job-species checks

* No freebies

* Early continues

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-08-04 08:01:35 +00:00
DGamerL
44671e31e8 Adds: The C-Foam launcher (#25738)
* The start

* Getting a bit further

* Slight ammo casing update

* Istype helper and foam blockage

* Adds status effect

* Foam blockage and status effect fixes

* Autolathe ammo + stun

* aaaaaaaa

* Adds uplink item

* Actual slowdown

* Makes attacking a bit faster again

* Ammo increase to 12

* Sirryan review

* Adds sprites - almost working

* Lots of fixes + mineral doors

* Mineral doors don't open with foam
2024-08-01 06:24:09 +00:00
Luc
165b9416be Adds firecrackers and decoy grenades (#25923)
* boom boom pow

* a few more sounds

* Add different forms to uplink and prize counter

* new and improved

* Fuse sound or not

* it's now a box and works properly.

* Reviews

* Minor tweaks

* static list

* ope

* adjacency checks

* angry
2024-07-30 13:58:49 +00:00
PollardTheDragon
521c43e2aa Getting Medieval - Snakesfang (#26296)
* Securiblade, Sheaths

* Snakesfang and Cleaver

* Crates and Armory

* Origin Tech Fix

* Chargers can now accept securiblades

* Clan Cleaver is now Breach Cleaver

* Armor Checking

* Comment and description fixes

* State comment

* More Comments

* Contains list fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Breacher sword hates doors

* Tab indentation

* Breacher Armor Buff - Status Effect while wielding

* Breach Cleaver Sounds - courtesy of Stoniest

* Snakesfang Codersprites

* Define Fix

* Breach Cleaver - Icon Codersprites

* Breach Cleaver Codersprites

* Gave help-intent attack on cleaver an animation

* Reduced sound intensity of wielded harm

* Moved variables below inherits

* Buff spacing, guard clause

* Improved examine

* Guard clauses the secsword powercell

* Sword mode defines

* Added undefs

* Spacing

* Securiblade loreful examine_more

* Examine_More for all swords

* Grammar

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

* Moved defines, added auto-docs, grammar

* Fixed secsword recharging

* Secsword burn function fix

* Cleaver Armor Buff Fix

* Fix to buff

* Securiblade burn fix, stamina charge reduction fix

* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed

* Fixes securiblade EMP oversight

* Snakesfang can parry now

* Spelling

* Removed define indents

* Early returns

* A whole lot of fixes. Qdels the cell on delete.

* stun_delay proc doc

* Update code/datums/uplink_items/uplink_general.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Merged IF statements, relocated inits

* Armor change

* Remove null in cell variable

* Ifs to Switch

* Revert "Armor change"

This reverts commit 6b61e33433.

* Better Ifs to Switch

* Removes roundstart armory blade, increases crate cost to 550

* Removed extraneous loc check, removed extraneous link cell proc

* Added null check to secsword/emp_act

* Added clear_cell proc to replace duplicate icon updates and cell nulls

* No vars in proc argument

* Properly nulls cell. Fixes cell sabotage for sword

* Just the Snakesfang

* Appearance update

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

* Appearance update

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

* Update code/game/objects/items/weapons/melee/melee_misc.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-07-30 13:46:44 +00:00
HMBGERDO
3e728beb93 Adds Nightvision Chameleon Glasses (#26075)
* nightvision chameleon googles

* im competent i promise
2024-07-11 02:24:05 +00:00
tipoima
608b4223b9 Adds a traitor rapid healing item: "Hyperregenerative Medipen" (#26033)
* Adds Hyperregenative Medipen to traitor uplink

* remove rogue pixel

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/hypospray.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

* Cuts iron, sanguine, and spaceaccil from the medipen

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

---------

Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-06 08:38:17 +00:00
HMBGERDO
8e57d9a40b 10TC!!! (#26076) 2024-07-06 08:33:40 +00:00
DGamerL
1a3a77d42c Replaces the projectile deflect from the titanium push broom with a good parry (#26061)
* No more reflect, good parry instead

* Remove this too
2024-07-03 03:50:03 +00:00
CRUNCH
3721e5328d Armour (#26019) 2024-07-01 18:55:51 +00:00
PopeDaveThe3th
aff6d15117 dsword uplink status (#25877) 2024-07-01 18:55:17 +00:00
DGamerL
b4bac5d681 Holoparasites are now discountable (#25943)
* Discount the parasite!

* Fix testing values

* More testing values gone

* Carp scroll not discountable again
2024-06-29 18:06:48 +00:00
PollardTheDragon
c3f0694bad Drask Traitor Item - Cryoregenerative Enhancer (#25885)
* Drask Traitor Item - Cryoregenerative Enhancer

* Removed extraneous list

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better Math

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

* Excessive spacing

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Comment fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Cleaner dna logic

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

* Better lore

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better readability on checks

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

* More noticable alert if empty.

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-29 17:54:39 +00:00
DGamerL
ed7782ad4c Adds the oneuse autosurgeon (#25978) 2024-06-26 20:38:53 +00:00
Qwertytoforty
e37c342401 Lowers the universal gun kit to stechkin pricing (#25961) 2024-06-22 22:45:09 +00:00
PopeDaveThe3th
2ef31cc6e4 spikethrower price decrease (#25872) 2024-06-20 11:38:20 +00:00