Commit Graph

42236 Commits

Author SHA1 Message Date
DGamerL
30f0e2df6e No you cannot eat the non-existing object (#22325) 2023-09-10 11:23:28 -05:00
Contrabang
d4cc3a6297 Adds a new config option to disable ambience and white noise (#22064)
* finally... sweet sweet silence...

* well it works

* oops
2023-09-10 17:12:15 +01:00
Adrer
17f78c56b9 Pizza bomb behaves normally again when alt+clicked (#22300)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-09-10 10:51:42 -05:00
Burzah
235cee1dec Fixes gland dispenser access (#22290)
* oops

* review update
2023-09-10 10:38:10 -05:00
DGamerL
ed0c4f334e Hmmmm not so sure (#22281) 2023-09-10 10:24:18 -05:00
DGamerL
79f9afb54e Ah yes, shuffle, of course (#22276) 2023-09-10 10:19:31 -05: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
e0bc923724 CPR hotfix (#22319)
* add missing to_chats

* typo
2023-09-09 23:30:20 -05:00
DGamerL
03ab6ae4b5 God I hate snowflaking this in (#22318) 2023-09-09 23:11:34 -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
Contrabang
fa52e8540e Adds more features to the ERT manager (#22070)
* BOOM UPGRADED

* self-review

* remove todo

* build tgui

* bam

* Update code/modules/response_team/ert.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-09 13:42:39 +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
Henri215
391948bf14 Ports some arcade sprites from Polaris (#22145) 2023-09-09 13:30:49 +01:00
matttheficus
abe481c759 Constructing/Deconstructing Suit Storage Units (#22093)
* god this was a headache

* prevent decon if locked

* henri review

* dont feel like coming up with something, someone else can do later if they want

* sean review

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

* henri review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-09 09:14:30 +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
DGamerL
58f4cdf9c5 [s] Fixes some investigate admin stuff that was missing (#22294)
* Guh

* Kills off storing logs in a var

* GDN review
2023-09-08 20:14:13 -05:00
Adrer
ff36c36493 Fixes cyborg bolting so it is no longer instant. Again. (#22279)
* Fixes bolting for real this time I swear

* Src is implied

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-08 16:53:22 -05:00
Venuska1117
b234b3e4ba Sort "mob_spawn.dm" to 2 specific categories. (#21728)
* NanoMap Auto-Update (Sun Jul  2 02:02:08 UTC 2023)

* Sorting mob_spawn file to have 2 categories.

* Holy jesus
So many files using alive and corpses... send help.

* Delete wizardcrash.dmm

* Trying..

* fixing mime/clown .dmm stuff

* Test

* Fix UpdatePaths file
now it should contain all corpses/alive path swapping.

---------

Co-authored-by: NanoMap Generation <action@github.com>
2023-09-08 21:23:30 +01:00
Burzah
086b88438b runtime and tracking fix (#22277) 2023-09-07 13:50:35 +01:00
tristan1333
1b5b67cb48 pizza boxes can be closed by alt clicking (#22043)
* pizza boxes can be closed by alt clicking

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* open = !open

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-09-07 12:08:50 +01:00
Qwertytoforty
6ee0d6f148 oopsy doopsy soulstone code kinda sucky (#22262) 2023-09-07 11:21:35 +01:00
DGamerL
4243f7b0f2 Mmmmmmm I love having no DNA (#22253) 2023-09-07 11:20:58 +01: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
Adrer
35505b9e45 AI in mech now uses mech cell instead of area power (#22241)
* AI in mech now uses mech cell instead of area power

* Update code/modules/mob/living/silicon/ai/ai_life.dm

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

* Update code/modules/mob/living/silicon/ai/ai_life.dm

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

* Update code/modules/mob/living/silicon/ai/ai_life.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-07 11:15:54 +01:00
Adri
2f97b83ff4 Refactors prescriptioning glasses a little, fixes a duplication issue (#22227)
* A tiny prescription refactor

* Changes grammar so it fits singular and plural src

---------

Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
2023-09-07 11:15:51 +01:00
Qwertytoforty
354c1e08dd Updates one variable. (#22220) 2023-09-07 11:13:28 +01:00
dearmochi
2fbbeeebe4 refactor: Merge job introduction message into one to_chat (#22219) 2023-09-07 11:13:01 +01:00
GDN
cfc6e19aef fixes people not being unbuckled from stuff if they're being pulled (#22209)
* fixes people not being unbuckled from stuff if they're being pulled

* could come up

* Update code/modules/mob/mob_movement.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-07 11:12:43 +01:00
Burzah
2484b29780 Moves clap emote from carbon to human emotes (#22182)
* moving day

* Apply suggestions from code review

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

* review fixes

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-07 11:09:15 +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
Henri215
b8b71043f8 Remote signaler tweaks (#22160)
* remmove signaler tweaks

* Update code/modules/assembly/signaler.dm

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

* Reviews

* Contra review

* Update code/modules/assembly/signaler.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-07 11:06:08 +01:00
DGamerL
31822a1831 Adds the Strong-Arm empowered musculature implant (#22159)
* Aaaaaaaaaaaa

* IT WORKS

* Okay now make it a martial art

* Final shit

* Forgor this

* Protolathe moment

* The sprite

* Typo fixes

* Burza review

* Contra review

* Contra review

* Contra + Henri review

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

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

* Me when I push untested code

* Contra review pt 1

* Contra review

* I forgor

* I forgot v2

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 11:00:45 +01:00
Sadhorizon
1eabd98bfa Miners can redeem their voucher on a new option now: a basic plasma cutter! (#22153)
* new mining kit!

* added a shelter to the kit

* NOW properly deconflicted
2023-09-07 10:56:08 +01:00
matttheficus
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
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
GDN
56ff3f3720 revenant haunted objects can no longer be dodged (#22075)
* revenant haunted objects can no longer be dodged

* better pathing + fuck it
2023-09-07 10:49:00 +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
Qwertytoforty
fdf4720878 Fixes lavaland mob spawning mechanics (#22199) 2023-09-06 21:27:37 +02:00
Adrer
f781310ae5 Prevents augmenting with just any robot_parts (#22242)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 20:01:49 +02: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
Aditya Garg
a9bd82735b Update merch_vendor.dm (#22203)
Rectified grammatical errors as instructed.
2023-09-06 19:14:17 +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
PopGamer46
516e9a6b84 Fixes a typo (#22177)
* spelling

* removes accidentally added space

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-06 19:03:48 +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
Contrabang
07e0b4fc97 bam (#22134) 2023-09-06 12:49:42 +01:00