* Martial arts no longer persist through cloning
* Remove unnessecary var declarations
* Combo counter
---------
Co-authored-by: Adrer <adrermail@gmail.com>
* 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
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
* Here we go so Cheese
Cheese
Cheese
Butter
Spread it
* I hate that this is so much better
Cheese
* CC mapping changes
* Update code/game/objects/items/granters/action_granters/summon_cheese.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* stuff
* works!
* bye bye tailwhip
* renames the ability
* accidental enter
* snowball's reviews
* tweak
* less tight timing
you can now ignite on 3u instead of 4
* no longer works with covered mouth
* ash walkers
* most of jimkils reviews + unathi also have c/d now
* early returns, uses less fuel, comments
* hal's reviews
* redundant comment
* hal's suggestion
* sounds & tweaks
* an unnecessary check
apparently
* so that check WAS needed
* henri reviews, tweaked loc of sounds, timer tweaks
* henri review
* Update code/modules/mob/living/carbon/human/species/unathi.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* 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
* 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
* 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>
* 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>
* 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>
* 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
* 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>
* 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>
warriorstar-orion