Commit Graph

10293 Commits

Author SHA1 Message Date
Contrabang
653fbdc8fb Heads' door remotes and access tuners now have a radial menu (#22175)
* radial stuff, wow

* hotfix

* unfuck this shit

* test

* aha, cool
2023-09-13 21:11:34 +01:00
Adrer
f84bbf85b9 C4 now properly explodes when an assembly is attached. (#22197)
* Changes assemblyholder to assembly in C4

* Minor change when planting C4 with assembly

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

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-13 21:06:01 +01:00
Qwertytoforty
54161357f8 Flashbangs are now affected by pressure like sound. (#22286)
* did you know? Flashbangs require sound to work!

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

* smh making me do it myself (as you should)

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-13 20:43:30 +01:00
GDN
c23fb7c910 Reverts Slowdown on pulling #21056 (#21596) 2023-09-13 11:40:53 +01:00
GDN
7d1633f029 drops the price of the syndicate ai module significantly (#22298) 2023-09-13 10:42:51 +01:00
JimKil3
5450f598bf Adds the holo-cigar, a human-specific traitor item (#22062)
* badass trait

* the cigar

* sprites ft. mcramon

* makes it obtainable

* Apply suggestions from code review

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

* contra review

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

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

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

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

* henri review

* contra broke everything

* contra broke everything pt 2

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

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

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

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

* lewc review

* update_icon_state

* Apply suggestions from code review

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

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

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

* are you happy now dgamer

* henri review 2

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-12 17:10:23 -04:00
Contrabang
30dacc03e3 Adds crutches (#21959)
* crutches!

* comment update

* henri review

* comment tweak

* in-hands updated

* i can spell

* two handed component

* unfuck this file

* oh lord map changes

* make the placing a little more reasonable...

* changes to cyberiad
2023-09-11 12:50:05 -05:00
matttheficus
072a958398 Total Mining Points on ID/Ore Redemption Machine (#22143)
* it begins

* Revert "it begins"

This reverts commit 02f90f4ce9.

* oopsies, restart

* here we go again

* oopsie again

* god i finally figured out TGUI

* henri review

* tgui update

* Update tgui.bundle.js

* tgui

* Update tgui.bundle.js
2023-09-10 19:07:30 -05:00
DGamerL
a2922ad5fd [s] Fixes a fusion gauntlet issue (#22341)
* Infinite sparks go brrr

* Qwerty + Steelslsayer
2023-09-10 18:56:45 -05:00
JimKil3
aaad2a5aba Adds the Oblivion Enforcer wizard loadout (#21920)
* initial addition

* adds wall/airlock obliteration
this definitely needs to be tuned a bit numbers-wise

* adds TRAIT_SUPERMATTER_IMMUNE & gloves

* adds more checks for the supermatter immune trait

* removes SM tongs logic from the halberd
Realistically, you would never actually have the halberd and tongs

* makes slivers bulky

* dusting downed people
also removing a useless assigned variable i missed

* adds the (incomplete) loadout

* halberd buff

* adds robes + sprites

* oops

* halberd icons

* knockdown

* stuff

* timer shortening

* species sprites part 2

* animation for dusting walls

* Apply suggestions from code review

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

* early return

* parry numbers!

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* dgamer review

* dgamer review + no more pulling

* reverts early return thingamajig

* Update code/modules/power/engines/supermatter/supermatter.dm

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

* removes `get_turf`

* hal review pt 1

* hal review pt. 2

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* `carve_sliver` proc

* unfucks icons

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-09-10 22:15:12 +01:00
Marm
e59f0e8aea Makes the Quartermaster a Head of Staff (#22133)
* remote

* more additions

* tgui + ssu

* map edits

* Shut your mug

More changes, huds, mugs and icons.

* mug time

* aaaa

* fixes cere edits

* should fix it

* Update tgui/packages/tgui/interfaces/common/CrewManifest.js

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

* Update code/game/machinery/suit_storage_unit.dm

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

* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"

This reverts commit 5de07cba58.

* mugs all the way down

Fixes locker headset oversight, adds icon for supply management console, new QM mug sprite

* more map changes

* wow this worked?

* Misplaced comma

Removes a misplaced comma.

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

* Mr QM's Wild Ride

Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.

* Forgot a var name change, I'm gonna cry edition.

Renames name to board_name for supply ID computer.

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

* genesis 1:3

Alters light_color of supply management console to brown_orange from light_color_red

* Update code/modules/events/bureaucratic_error.dm

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

* another misplaced comma

Removes a comms where there should not be one.

* saving private ryan

Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.

* redone map changes

* oop

* the last of it

* merge time

---------

Co-authored-by: GDN <Roanrichards1@Gmail.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-10 20:53:05 +01:00
Contrabang
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
Luc
d392209cb5 Reworks CPR, allowing it to extend defibrillation time (#21754)
* Update traditional CPR to loop automatically

* Implement most of the base stuff

* Bring over most defib changes so far

* Checks and fixes

* cleans up some leftovers, getting it ready for review

* Little bit of IPC flavor

* excludes non oxy-breathers, sorry!

* Better rescue breath handling

* Refactor revivability into a status effect

* Adds a little bit of feedback

* Removes the original variables

* Allows for CPR to activate cavity bombs

* Update code/modules/mob/living/carbon/human/human_mob.dm

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

* snake case time

* breathid instead

* remove unused proc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-09 21:59:47 -05:00
Contrabang
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
StealthCT
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
Silverplate
9562e8e831 Reworks and buffs turbine, disables TEG crate (#21343)
* comments out TEG crate

* buffs turbine power generation curve.

* adds overheat to turbine

* Allows for overheat to dissapate while at low RPM

* Adds bearing heat meter to control console

* Multitool is now required to link turbines

* spacing consistancy

* comment per Sirryan review

* adresses review, replaces reconnect with DC button

* better comments

* properly defines things. debugging is important

* temp must be above 500k for power to be generated

* Adresses latest review

* Define fixes

* TGUI update

* should fix CI. Probably.

* typo fix

* lewcc review

* Deconflicted TGUI

* Heri and Hal reviews

* Deconflict TGUI

* deconflicts TGUI

* Steel review

* Slight formatting

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-09-08 20:14:57 -05:00
matttheficus
ae78b936e5 Removes All CamelCase'd "NanoTrasen" (#22156)
* begone CamelCase

* someone did an oopsie and it wasnt me

* CI addition (thanks contra)

* contra review

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

* CI moment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-07 11:18:29 +01:00
GDN
d540f421f4 Prevents blood from attempting to dry if said blood no longer exists (#22174) 2023-09-07 11:06:40 +01:00
matttheficus
405d794bd3 Jammers Now Prevent Tracking + Slight Range Buff (#22149)
* this was easier than i thought frankly

* hmbgerdo review
2023-09-07 10:53:46 +01:00
matttheficus
2d455a4cbf aint this kinda funny? (#22139) 2023-09-07 10:53:16 +01:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119)
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

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

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 10:52:48 +01:00
PopGamer46
50443325bf Adds Twimsts, a snack that can be used as eatable handcuffs (#22092)
* adds twimsts, the eatable handcuffs

* fixes twimsts cuffs showing up as cable on examine

* missing ending newline fix

* spelling

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

* list formating or something

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

* removes unnecessary bit of description, why did i put that there?

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

* 0 to FALSE

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

* path fix

* removes note showing wrong intent of adding code

* removes unnecessary examine

* code shortening, optimization, something?

* fix

* proper proc

* oops

* better sprites

* trash sprite not eaten?

* even better sprites

* removes extra empty line of code

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

* fixes improper code formatting or something

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-07 10:39:29 +01:00
DGamerL
702893d02b Deletes the space worm (#22251)
* But every brave man wants to be wealthy

* even though it would mean losing thisgreattreasure
2023-09-06 22:19:58 +01:00
Adrer
9ce4886bc6 Fixes check for gravity generators on Z-level (#22239)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:59:22 +02:00
Cocacolagua
e8b693a26c fixed camera bug bug (#22230) 2023-09-06 19:57:23 +02:00
Adrer
40f5493b1e Changes clamp to use max_matter instead of magic number (#22195)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:08:50 +02:00
Contrabang
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
Burzah
c05f40b01c buckling runtime fix (#22204) 2023-09-01 18:32:30 -05:00
TaM-tHe-JaM
e07d63702c Islamic Garb - My First Contribution (#22040)
* abayacontribute

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* adding a slash

* Update code/modules/clothing/suits/hood.dm

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

* NVM didnt get deleted, didnt transfer

* tab fix

* removed comma

* Deleted unnecessary list, thanks DGamerL

* deleted

* finallymergeconflictgone

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:33:44 +01:00
GDN
08eb183875 Gives the bartender their own version of judo (#21886) 2023-09-01 23:20:47 +01:00
Marm
7336750e48 Paramedic QOL - Lavaland Edition (#22154)
* paramedic grindset

Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.

* goodbye soul hello garment bags

Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.

* headset, i barely know her

Paramedic headset moved out of garment bag and into main locker.

* lore???

Turns out I've been spelling Nanotrasen wrong all this time.

* Update code/game/objects/items/devices/radio/headset.dm

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>

---------

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
2023-09-01 23:19:41 +01:00
Burzah
67901058ae Unum! The card game. (#22152)
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

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

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:18:37 +01:00
Silverplate
622dc36357 Updates the Supermatter Engine Book to act as a pocket guide for SM events (#22072)
* SM book updated (it only took like 5 years)

* Grammar police reviews

* Updates book to reflex hotfix
2023-09-01 23:13:04 +01:00
JimKil3
e29dab21f0 Buffs cryogenic anomalies (#22002)
* cryogenic anomaly buff

* setus vpeculator
2023-09-01 23:07:31 +01:00
Contrabang
b99db3d3d0 Allows for easier pulling onto beds and chairs, buckling someone stops anyone currently pulling them. (#21960)
* wham-bam

* oops
2023-09-01 23:04:04 +01:00
Sadhorizon
6aefc3fa12 VIP lockers now get more spare gear. (#21957)
* VIP lockers now get more gear

* all three bags
2023-09-01 23:03:10 +01:00
HMBGERDO
42c762ccd2 Using medicine on yourself on activate (#21955)
* now you can use patches, pills, injectors

* more supported meds

* apply proc
2023-09-01 23:02:34 +01:00
HMBGERDO
6d890ca3e6 No more accidental put baton on table/in backpack (#21946)
* fixing putting baton on the table by accident

* storage items support

* storage item check tweak
2023-09-01 23:01:12 +01:00
Henri215
e5ca69bd06 Ports some sounds for toolbox/briefcase/switch (#21938) 2023-09-01 23:00:36 +01:00
GDN
e9acb9fde4 prevents xenos catching thrown items they can't hold (#21766)
* prevents xenos catching thrown items they can't hold

* gogo gadget duplicate code

* trait solution
2023-09-01 22:37:09 +01:00
1080pCat
99f24119c5 yippie cyborgs and drones get them now (#21608) 2023-09-01 22:34:41 +01:00
Luc
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
Burzah
20302523d9 guest pass cant be used on personal lockers (#22045) 2023-09-01 21:49:03 +01:00
GDN
6bf9bb963d readds baton throwing (#21481)
* readds baton throwing

* forgot this

* judo

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

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

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

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-31 17:54:07 +02:00
Contrabang
e754819607 Merges LAZYDISTINCTADD and LAZYADDOR (#22138)
* kills off LAZYDISTINCTADD

* Changes it to Distinct Add...
2023-08-28 15:44:56 +01:00
SchrodingersWolf
86a8690907 Added the Armored Suit Jacket to both the Uplink and as maint loot (#22011)
* Added the armored suit jacket from the Agent 47,
Bond and Professional Bundle to the Uplink. Also
allowed it to be spawned as maint loot.

* Messed with main loot drop values

* Telecrystals son, they increase when exposed to inflationary pressure

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-28 13:15:33 +01:00
tristan1333
37c46903d0 /obj/structure/alien/egg/grown has a prox timer now (#22106) 2023-08-26 10:26:18 -05:00
SchrodingersWolf
b820ced744 Removes unused slime jelly bloodcrawl interaction (#22022)
* Removes unused slimeblood bloodcrawl interaction

* Removed cult blood magic checks as well
2023-08-25 16:58:28 +01:00
Praveen Shinde
d07ca40d76 Fix: Typos with a crowbar and a sign #22033 (#22034) 2023-08-25 16:30:22 +01:00
Cocacolagua
6f8abfd3f7 fixes empty sandbags (#22071) 2023-08-25 16:17:07 +01:00