Commit Graph

30 Commits

Author SHA1 Message Date
Tom
ea18641470 Fixes default MCR charging (#16386)
mcr charge fix
2022-09-24 12:15:48 -07:00
Paxilmaniac
7bf66e8780 Reworks microfusion guns to behave like energy guns that can be upgraded, not like ballistic guns that happen to fire lasers (#16017)
* dont look at the branch name

* removes the rechargeable attachment from cargo, fixes a desc

* its a two handed weapon y'all

* its a tradeoff, not a flat upgrade

* copypaste naming my beloved

* unless its admin or has big downsides, everything should be a sidegrade

* reorders the messages

* a whole bunch of realizing these modules dont mean anything anymore

* we dont need ammo pouches since we dont reload these anymore

* i forgor a few

* some fixes to make self charging usable

* indentation fixes, this is also a constantly running fusion reaction

* damnit i forgor
2022-09-17 22:42:49 -07:00
SkyratBot
1b7f17f107 [MIRROR] [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1) [MDB IGNORE] (#15801)
* [IDB IGNORE] The Great Sweep: Moving dmis into subfolders (part 1)

* Fixes all the conflicts and all of our modular files using core icon files with broken paths

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-28 15:11:04 -04:00
SkyratBot
70b4a01a17 [MIRROR] Cleans up update_icons, makes the update_icon_updates_onmob element bespoke, updates CODEOWNERS [MDB IGNORE] (#15673)
* Cleans up update_icons, makes the update_icon_updates_onmob element bespoke, updates CODEOWNERS

* Update CODEOWNERS

* Cleans up update_icons, makes the update_icon_updates_onmob element bespoke

Co-authored-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-18 17:20:48 +01:00
SkyratBot
d7ef0f27cb [MIRROR] Converts all research categories into defines [MDB IGNORE] (#15599)
* Converts all research categories into defines

* this took an hour

* h

* update research categories include

* update research categories include

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-08-17 17:16:38 +00:00
SkyratBot
ae708cd7b5 [MIRROR] Removes ComponentInitialize() [MDB IGNORE] (#15552)
* Removes ComponentInitialize()

* Fixes a leftover merge conflict marker

* Fixes the oversight that came from the upstream merge skew

* Fixes all of the instances where we used ComponentInitialize() when we shouldn't've been

* Fixes CI being broken because of the HEV suits

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-12 19:05:09 -04:00
SkyratBot
d2e1be321f [MIRROR] Refactors Gunlight / Helmetlight to be a component [MDB IGNORE] (#14226)
* Refactors Gunlight / Helmetlight to be a component

* wew

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-06-10 20:49:38 +01:00
Tom
6d3a8fbec7 goodbye box comments (#13826) 2022-05-23 17:00:34 +01:00
Tom
f2d3ea41f4 converts unnecessary capitals in names to lowercase (#13676)
* converts unnecessary capitals in names to lowercase

* Apply suggestions from code review

Co-authored-by: Cursor. Maybe? Who knows? <102828457+theselfish@users.noreply.github.com>

Co-authored-by: Cursor. Maybe? Who knows? <102828457+theselfish@users.noreply.github.com>
2022-05-23 11:38:57 +01:00
SkyratBot
86c72f9302 [MIRROR] Lathe taxes now checks departmental flags [MDB IGNORE] (#13563)
* Lathe taxes now checks departmental flags

* Update tool_designs.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-17 21:42:51 +01:00
ErdinyoBarboza
6a671701d6 walkandload (#13557) 2022-05-13 12:24:44 +01:00
Useroth
cca7f8ee4c Some missed mirrors (#13415)
* Refactors firestacks into status effects (#66573)

This PR refactors firestacks into two status effects: fire_stacks, which behave like normal firestacks you have right now, and wet_stacks, which are your negative fire stacks right now. This allows for custom fires with custom behaviors and icons to be made.

Some fire related is moved away from species(what the fuck was it even doing there) into these as well.
Oh and I fixed the bug where monkeys on fire had a human fire overlay, why wasn't this fixed already, it's like ancient.

Also changed some related proc names to be snake_case like everything should be.

This allows for custom fire types with custom behaviours, like freezing freon fire or radioactive tritium fire. Removing vars from living and moving them to status effects for modularity is also good.
Nothing to argue about since there's nothing player-facing

* Hud Image Culling By Z Level: Theft edition (#65189)

* makes hud images only apply by z level

* makes some of the atom_hud procs have better names

* fixes warning with the hud_user list and adds better documentation

* better docs for hud_images

* removes TODOs

* docs for hud_list

* adds support for linked z levels so mobs can see lower ones

* fixes merge conflict and shittily makes only shocked airlocks get added

* adds support for setting images in the hud as active and inactive

* gets rid of unatomic spatial grid change

* maybe i should actually try COMPILING my changes

* fixes merge skew and makes it compile again

* fixes huds refusing to remove from users who changed z level

* improves z level and registration logic

* fixes antag huds not appearing

* Fixes antag huds not properly setting. We now use hud_list in init, so it needs to be set before the new call, not after. Not sure why the use of appearance key was split like this, but none else knows either so none can stop me

* Ensures that hiding a basic appearance also hides the atom's active list too

* Fixes antag huds going poof

Ensures that remove_atom_from_hud will return false if the passed atom
isn't managed by it

This fixes antag huds disappearing randomly, since they assumed that if
the parent call of remove_atom_from_hud returned true, we should delete
ourselves. This is a safe assumption for them to make, since they should
only ever have one atom.

Does kinda bork if we call remove_atom_from_hud in a way that is unsure
if the passed atom is actually in that list. We were forced into doing
this by how atom huds use the qdeleting signal.

* makes basic alternate_appearance's only update themselves when setting their hud image to active and makes them not add themselves to the global huds_by_category list

* fixes mistake with hud_users list being set non associatively (bad)

* as anything in bot path loops

* Fixes merge skew problems

* Makes bot paths non global

This way they can show themselves to only the bot that "owns" them, ya
feel me?

* Fixes huds not showing up sometimes, cleans up some code

Post Kapu's limb refactor, we were calling prepare_huds twice in a human
init call chain. What was happening was this:

call prepare_huds() // Human
I gained a new hud image
I set active hud icons to mirror it
call prepare_huds() // Living
I overwrote the new hud image
I attempted to set active hud icons, which failed because it assumes
this can never happen

*cries*

* Renames add_hud_to_atom to show_to

My hope is this will make understanding hud code a bit easier, by tying
the behavior to a "verb" more closely. Also renamed a few vars

* remove_hud_from_mob -> hide_from

* Nitpicks a few comments

* Whoops/fuck/shit/damn it all/hhhhhhhhhhhh

* Moves check down, improves stack trace a bit

Co-authored-by: KylerAce <kylerlumpkin1@gmail.com>

* small touch-up

* this should do it

Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KylerAce <kylerlumpkin1@gmail.com>
2022-05-08 03:59:40 +01:00
Zonespace
c8532edabd scope (#13115) 2022-04-26 13:39:32 +01:00
Zonespace
349a3325ec Adds Gun Cargo (#12632)
* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
2022-04-23 17:34:08 +01:00
Tom
6a8d218638 MCR renaming adjustment (#12961) 2022-04-21 15:07:49 +01:00
ErdinyoBarboza
1b7bb9ab17 Update cargo_stuff.dm (#12931) 2022-04-20 16:58:02 +01:00
RatFromTheJungle
aa8950c275 [MODULAR] Removes the undercharger MCR attachment. (#12688)
* rere

* Update microfusion_designs.dm

* Update microfusion_techweb.dm

* Update microfusion_gun_attachments.dm

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-13 22:00:13 +01:00
OrionTheFox
3abfdf8160 cells fix!! (#12724) 2022-04-13 14:57:12 +01:00
SkyratBot
8477577119 [MIRROR] changes projectile's armor resistance flag to "armor_flag" [MDB IGNORE] (#12234)
* changes projectile's armor resistance flag to "armor_flag" (#65487)

* IHATEVARIABLES

* removes the face

* changes projectile's armor resistance flag to "armor_flag"

* e

Co-authored-by: capsaicinz <84609863+capsaicinz@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-03-23 21:25:41 +00:00
YakumoChen
d3aee69b13 [MODULAR] Refactors MCR designs (#11536)
* refactors MCR design

* forgot one designpath

* more sorting

im sorry @ErdinyoBarboza

* linters hate him!

* not again

* I found a bug
2022-02-22 16:03:02 +00:00
ErdinyoBarboza
55c31ab34d [SEMI-MODULAR] MCR Expansion Vol 1 & Balance Passes (#11377)
* LasersAreTameNow

* HellfireAndSuperheat

* Update readme.md

* Modular Edit of Damage

* moreupdates

* Update modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>

* goerofsleepy

* eep

* morestuff

* Update microfusion_gun40x32.dmi

* Update microfusion_designs.dm

* price

* oops

* whyisthiscodenotworking

* help

* aaaaaaaaaaa

* how

* YeahBabyWeMadeIt

* wowcoolreloads

* LetsGoBaby

* coolbox

* Update modular_skyrat/modules/microfusion/code/cargo_stuff.dm

Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>

* reviews

* missedone

* cells

* cargo

* aaaaaa

* lasernerf

* refactor

* hhnnngh

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
2022-02-20 12:49:33 +00:00
Zenitheevee
d004f40a3c why cant you be righthanded like all the other guns!? (#11220) 2022-02-02 16:38:13 -05:00
Tom
97387d5a7f fixes microfusion cell emp_act (#11077) 2022-01-28 17:02:24 -05:00
Tom
33707af86b MCR fix 2 (#10720) 2022-01-15 21:42:39 +00:00
Tom
548144caae MCR patch (#10714) 2022-01-15 16:28:22 +00:00
SkyratBot
58f82b5161 [MIRROR] [Ready] MODsuits [MDB IGNORE] (#10244)
* [Ready] MODsuits

* we dont need to add these people as codeowners, goodness gracious

* have to remove this because upstream

* part 1 of these fixes

* EEEE

* Update peacekeeper_clothing.dm

* E

* E

* Auto stash before merge of "upstream-merge-59109" and "origin/upstream-merge-59109"

* E

* Update expeditionary_trooper.dm

* more removal

* nice

* modsuti modstui modusuti

* fixes

* E

* ITS MODsuit not HARDSUIT

* more hardsuit references

* MODSUIT NOT HARSUITEDSA

* Maps

* More ,map

* oop

* e

* oo aa

* 0

* ting tang

* Update modsuit_tailsprites.dm

* hi fikou

* bs tech update

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-25 13:32:49 +00:00
Tom
7a5ecf5ddb fixes microfusion charging runtime (#9953) 2021-12-08 16:50:50 +00:00
Nerevar
10a4b4b189 Small Microfusion Hotfix (#9936) 2021-12-07 15:59:54 -05:00
Gandalf
5d5d693981 Microfusion bugfixes (#9911) 2021-12-06 19:12:21 -05:00
Gandalf
f3020a7f42 Microfusion Energy Guns (#9638)
* RELOADING!

* Update skillchip.dm

* a

* Update master.dm

* Update master.dm

* Part one

* E

* E

* EOR

* Oops

* EEEH

* Fixes.

* begone oldcode from old times

* fixes

* cell attatchments

* haha u cant spell

* Gun attachments!

* Fastest gun in the west

* Update multi_cell_charger.dm

* ESA

* Stability

* phase emitters

* foixes

* More fixes

* Update microfusion_gun_attachments.dm

* Update microfusion_gun_attachments.dm

* eee

* Intermediate interactions.

* Update microfusion_energy_master.dm

* wooh

* EEE

* Update microfusion_cell.dm

* Map edits

* Merge branch 'master' into gun_reloads

* E

* attachment removal

* Update _basemap.dm

* proper parent gun interactions

* Update code/game/machinery/recharger.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* E

* Update modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* Review comments pt2

* review comments pt2

* review part 3

* review part 4

* review 4.1

* review fixes

* Update microfusion_designs.dm

* ffs

* Update code/__DEFINES/~skyrat_defines/traits.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Nearly there

* final review commit

* Update multi_cell_charger.dm

* Update microfusion_energy_master.dm

* E

* insight

* Fixes, rgb, remove instability on cells

* de epic

* Update _basemap.dm

* TGUI in the houise

* Update MicrofusionGunControl.js

* FULL STEAM AHEAD CHOO CHOO (Adds zooming)

* FUU bayonets and flights

* e

* Nearly

* microCHANGES

* Update gun.dm

* Minidate.

- Shooting the gun while it's overheating can cause it to [REDACTED].
- Shooting the gun while it's overheating will burn your hand!
- Some cells will now notify you when they're empty using an alarm sound.
- Gun barrel attachments now change the sound of the laser!
- An overheating emitter slows down!
- Emitters now control fire time more!

* 0

* owo

* FFF

* Update code/game/machinery/recharger.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/gunhud/code/gun_hud_component.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* no spolsion

* Generally we want the cell in our hands

* 0

* Update microfusion_gun_attachments.dm

* E

* E

* FINAL

* superheater

* Update projectiles.dm

* Update microfusion_energy_master.dm

* Update projectiles.dm

* Update microfusion_gun40x32.dmi

* Update laser_1.ogg

* E

* whoop

* Cargo crates!

* Review plus material updates

* Update microfusion_designs.dm

* E

* E

* E

* E

* EEEE

* Update gun_spawns.dm

* Some fine tuining

* Update gun_spawns.dm

* Update recharger.dm

* E

* Update microfusion_gun_attachments.dm

* E

* E

* Update microfusion_gun_attachments.dmi

* Update code/game/machinery/recharger.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* E

* You can now actually insert different cells into advanced guns!

* 0

* E

* Update microfusion_gun_attachments.dm

* Update microfusion_energy_master.dm

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* E

* Update microfusion_energy_master.dm

* Update microfusion_gun_attachments.dm

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-12-03 22:38:08 +00:00