Commit Graph

203 Commits

Author SHA1 Message Date
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
7f84ff9a66 Fixes the game triggering a do_after when you mouse over an inventory slot with a non-instantly equippable item. (#59548) (#6198)
Mousing over an inventory slot with an item in-hand can trigger a call to equip_delay_self_check.

If the item has an equip_delay_self and bypass_equip_delay_self is FALSE, then it acts like it's going to equip the item and starts a do_after.

I think the only two items that do this are /obj/item/clothing/gloves/cargo_gauntlet and /obj/item/clothing/suit/straight_jacket

I make sure the call to can_equip back in the /atom/movable/screen/inventory/add_overlays section of the call stack calls with bypass_equip_delay_self = TRUE to prevent this.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-06-09 10:44:39 +12:00
Gandalf
0b957f39a9 Lobby UI overhaul (#4738)
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* aaaaa

* Update _basemap.dm

* Update new_player.dm

* Update CaveGenerator.dm

* aaaaaaaaaaaaaaaaaaaaa

* a

* aaa

* aaaa

* aaaa

* Update login.dm

* aaaaaaaaaa

* aaaaaa

* Update lobby.dm
2021-04-09 21:18:40 +01:00
Gandalf
d14f4ea7c9 Revert "Revert "[MIRROR] Layer overhaul (#4503)" (#4509)" (#4536)
This reverts commit b27ede689e.
2021-03-31 02:08:56 +01:00
Useroth
b27ede689e Revert "[MIRROR] Layer overhaul (#4503)" (#4509)
This reverts commit 8ac892d340.
2021-03-30 23:45:08 +01:00
SkyratBot
8ac892d340 [MIRROR] Layer overhaul (#4503)
* Layer overhaul (#57915)

## About The Pull Request
Changes up some layer and plane defines for no particular reason lol

## Why It's Good For The Game
Planes actually override layers, and layers control ordering within planes. A lot of the usage of plane and layer was wholly unnecessary. This refactor helps future maintainability while also being needed staging for _future features._

* Layer overhaul

* aaaaaaaaa

a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-29 16:36:36 +01:00
SkyratBot
daec7111cd [MIRROR] You can now put food on plates, and plate no longer materialize out of nowhere as you cook (#4418)
* You can now put food on plates, and plate no longer materialize out of nowhere as you cook

* Update dish_drive.dm

* aaaaaaaaaaaaaaa

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-26 15:40:39 +00:00
SkyratBot
02a5d7eede [MIRROR] Blobbernaut HUD improvements (#4428)
* Blobbernaut HUD improvements (#57922)

* Blobbernaut HUD improvements

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-03-26 14:20:37 +00:00
SkyratBot
496df13d30 [MIRROR] Improves status bar coverage (#4394)
* Improves status bar coverage (#57916)

This PR makes sure all MouseEntered() procs call their parent, which handles the status bar. This fixes instances where the status bar was missing, for example when you hovered over the ghost buttons, you would not be shown a name of the button, but completely different object, like "space", which was very misleading. This also means that the new status bar should have better parity the with the old status bar, which also showed these things.

* Improves status bar coverage

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-03-25 16:59:29 +00:00
SkyratBot
391f1d2552 [MIRROR] Item hover outline FX (#4090)
* Revert "[MODULAR] Adds item outline glow (#3861)"

This reverts commit 9ea4373618.

* ..

Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-03-12 22:44:54 +00:00
Gandalf
9ea4373618 [MODULAR] Adds item outline glow (#3861)
* start

* Update outline_procs.dm

* Update outline_procs.dm

* Update outline_procs.dm

* Update outline_procs.dm
2021-03-04 21:52:11 +00:00
SkyratBot
0ee54f4bd4 [MIRROR] Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change). (#3672)
* Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change). (#57167)

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

* Combo streaks (not just the hud icons) now reset after half a dozen seconds (amount subject to change).

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghommie <425422238+Ghommie@ users.noreply.github.com>
2021-02-26 14:09:01 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
9902105907 [MIRROR] Replaces Construct HUD with a generic version (#3442)
* Replaces Construct HUD with a generic version (#56942)

* Replaces Construct HUD with a generic version

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-02-17 01:16:13 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
e890b1282b [MIRROR] Replaces intents with combat mode (#3063)
* Replaces intents with combat mode

* updates

* a

* Update living_defense.dm

* https://github.com/tgstation/tgstation/pull/56638/files

* gunsafety!

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 16:58:16 +01:00
SkyratBot
2ccfc29da1 [MIRROR] Martial arts combo meter (#3022)
* Martial arts combo meter (#56520)

* Martial arts combo meter

Co-authored-by: Jack LeCroy <3073035+jacklecroy@users.noreply.github.com>
2021-02-02 19:03:41 +00:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
8d130ce006 [MIRROR] Fix 'your mind won't reach that far' message when clicking moodlet with TK (#1773)
* Fix 'your mind won't reach that far' message when clicking moodlet with TK (#55070)

The mood /atom/movable/screen, instead of having a Click() override, instead has its COMSIG_ATOM_CLICK registered in the mood component. This has the side effect of normal attack chain protocol being ran on it, meaning that if you click it with TK you will get a message saying "Your mind won't reach that far". This fixes that by overriding attack_tk into a noop.

* Fix 'your mind won't reach that far' message when clicking moodlet with TK

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-22 18:22:26 +00:00
SkyratBot
e768cef297 [MIRROR] /obj/screen --> /atom/movable/screen (#1646)
* /obj/screen --> /atom/movable/screen

* Update storage.dm

* Update radial.dm

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-11-11 04:12:50 +01:00
SkyratBot
28472fa8f3 [MIRROR] Moves screen objects from mob to hud (#1336)
* Moves screen objects from mob to hud (#54400)

This moves screen images from icons/mob to icons/hud
Makes more sense and it is easier to find

* Moves screen objects from mob to hud

* Update radial.dm

Co-authored-by: nicbn <nicolas.nattis@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-16 03:37:54 +02:00
SkyratBot
970a2b03d6 [MIRROR] Mobility refactor: no more update_mobility() (#1233)
* Mobility refactor: no more update_mobility()

* Update robot.dm

Fixes robots.

* megadumb

* Update robot.dm

* weh

* Update gunpoint_datum.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-10-10 02:31:35 +02:00
SkyratBot
407dc26fd1 [MIRROR] Prevent inventory HUDs from overlapping multiple overlays (#1042)
* Prevent inventory HUDs from overlapping multiple overlays (#53974)

Currently, when you drag your mouse off an inventory button while holding it down, it'll leave a permanent ghost image (#53950). This is because MouseExited is not being called properly. However, I couldn't reproduce this in a non-SS13 BYOND project, which makes it difficult for me to fix that.

This is a band-aid fix. It'll leave a ghost image, but then the next time you hover over and exit, it'll remove it, making it much less annoying.

* Prevent inventory HUDs from overlapping multiple overlays

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-09-29 12:28:48 +02:00
skoglol
f93e63f7d6 Merge pull request #52207 from Jared-Fogle/stasis-in-dorms-4
You can now take off clothes while on stasis
2020-07-23 12:02:39 -04:00
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
Ryll-Ryll
fc0b247738 rename 2020-07-11 23:23:23 -04:00
L
4e5306f754 More defines moves 2020-06-01 20:18:44 -03:00
Ryll Ryll
5c174800fb Grenades and projectiles can have shrapnel and embed, all carbons can suffer embeds, some bullets can ricochet, sizable refactor of embedding (#49634)
About The Pull Request

It annoyed me that we have a perfectly good frag grenade item, and a perfectly good shrapnel component, but no crossover episode between the two. This remedies that, and does a lot, lot more.

dreamseeker_2020-03-30_05-01-13.png

dreamseeker_2020-03-30_05-01-26.png

Big points:

    Adds new component: pellet_cloud, which can be used by ammo casings, guns, and landmines to spray shrapnel and display aggregate hit messages ("You're hit by 6 buckshot pellets!" vs "You're hit by the buckshot pellet in the X" x6). All gun ammo that shoot multiple pellets now use this component on firing.
    Adds stingbangs, premium less-lethal grenades that shoot off lots of stinger pellets, to cargo. Frag grenades are also reworked to have smaller booms, but shoot off lots of shrapnel shards. You can jump on top of these grenades to absorb a portion of the shrapnel to save those around you! There's an achievement for dying this way, called "Look Out, Sir!"
    Projectiles can now embed items/shrapnel. Adds .38 DumDum ammo to cargo that does less damage and has negative armor pen, but can embed in people. This is the only ammo that currently embeds.
    Bullets can now ricochet off walls, structures, and machinery (harder surfaces are more likely to ricochet). Only standard .38 and Match Grade .38/.357/L6 ammo can ricochet, with Match Grade being much better at ricocheting. You can buy Match Grade .38 from cargo and Match Grade L6 ammo from the nuke uplink, while Match .357 is admin only.
    Armor now protects you from harmful embeds, taking the better of the bullet/bomb armor on the affected limb. Armor penetration can modify this of course, and many blunt embeds like stingbangs and DumDum bullets are significantly worse if you have even 1 armor.

Other misc fixes/changes

    Refactored the embed element a bunch and fixed it creating new elements for every instance rather than expected bespoke behavior. There are new /obj/item helpers for modifying and adding embedding.
    Fixes #49989: Spears can no longer embed in turfs cause their sprite is annoying to me, it's generally harder for most things to embed in turfs
    Fixes #49741: New carbon helpers for removing embedded objects
    Fixes #46416: Handles embedded objects getting qdel'd or moved while embedded
    Renamed the old shrapnel component for RPG loot to MIRV to avoid confusion
    Repathed frag grenades from under minibombs to under base grenades, and added explosion vars to base grenades

Why It's Good For The Game

Fixes a bunch of janky design with embeds, adds lots of new avenues for projectile and grenade variety, ricochets and collateral damage are fun!
Changelog

🆑 Ryll/Shaps
add: Adds stingbangs to cargo (and one in the sec vendor premium), premium less-lethal grenades that shoot off a giant swarm of stingball pellets to help incapacitate swarms of people in tight quarters. You can jump on top of a live one to be a hero and absorb a bunch of shrapnel, same with frag grenades. There's even an achievement for dying to a grenade you jumped on!
add: Projectiles can now embed in people! Or at least grenade shrapnel and the new .38 DumDum ammo, now available in cargo, can. DumDum rounds excel against unarmored targets, but are pricey and do poorly against armored targets.
add: Bullets can now ricochet! Or at least, standard .38 and the new .38/L6 Match Grade ammo can. Match Grade ammo is finely tuned to ricochet easier and seek targets off bounces better, and can be purchased from cargo (for the .38) or nuke ops uplink (for the L6), but standard .38 ammo has a chance to ricochet as well.
tweak: Frag grenades now have smaller explosions but shoot off a bunch of devastating shrapnel, excellent for soft targets!
tweak: Shotguns and other multi-pellet guns now print aggregate messages, so you'll get one "You've been hit by 6 buckshot pellets!" rather than 6 "You've been hit by the buckshot pellet in the X!" messages. Bye bye lag!
balance: Armor can now protect against embedding weapons, taking the best of either the bullet or bomb armor for the limb in question away from the embed chance. Some weapons are better at piercing armor than others!
/🆑
2020-04-03 16:58:38 +13:00
Arkatos1
8538bc36e7 Removal of slime and elite huds (#50096) 2020-03-21 17:13:23 +01:00
nightred
395bebcdcc [READY] Space Suits use cells and warm the wearer (#49028)
About The Pull Request

This makes space suits use a cell and warm the wearer, This was handled by the handle_environment proc in the past with an override to make the suits work. This corrects this issue, and removes the override.

All space suits will have a cell installed at round start, this cell will last 15 min on average usage.

The cell cover can be toggled by alt+clicking (press the button), or using a crowbar (just pry it open) on the suit.
With the cover open you can remove the cell by using the suit in hand, or ctrl+clicking the suit.
As well with the cover open you can use a screwdriver to set the thermal regulator's temperature. The normal range is 20 c to 45 c, do not use an emag on the suit to increase the temperature range.

Examining the suit will report the temperature setting and the cells charge, if the cover is open you will also be able to see the type of cell that is in the suit.

Suit storage units will now charge the cells in suits, they will also require power to operate properly now.

Why It's Good For The Game

    Space suits should be managing the wearers temp in space not using some override.
    Lizards now have a portable heater in the form of any space suit.
    Now that suits need a cell it is not as easy to spend all session in a space suit.
    New interactions with hardsuits and emp's give nice combat buff to an underused item.
    Nuke ops can raid xeno for some nice yellow cells, or science for a big old bluespace cell.
2020-02-15 11:32:54 +13:00
Arkatos1
fbffe3c925 Living mob HUD cleanup (#49193)
* Living health HUD cleanup

* Elite icon cleanup
2020-02-13 01:14:39 +01:00
tralezab
7c5ffc5da4 513 health bars for simplemobs! (#48954)
* cleanup required

* removes bad stuff, makes linter happy

* megafauna still get SOME health doll, cleanup again

* whoop

* UNLINT
2020-01-28 04:29:37 -05:00
Arkatos1
0cfde60db2 Generic living HUD (#47685) 2019-11-24 05:15:54 +01:00
Emmett Gaines
4057c7b22c Migrates most machinery update_icon procs (#47284)
* Migrates most machinery update_icon procs

* Removes chargelevel

* Migrates newscaster's overlays
2019-11-08 17:29:23 -08:00
Arkatos1
02372ae376 Revenant hud fix (#47642) 2019-11-08 22:17:03 +01:00
Emmett Gaines
3bd6505ac0 Cleans up zone_sel and fixes init selection (#47371)
* Cleans up zone_sel and fixes init selection

* Removes selecting
2019-10-25 16:39:29 -07:00
IndieanaJones
ee2c658098 [READY] Adds Pulsating Tumor Ruin and Lavaland Elites (#46566)
* Adds elite.dm and elite_goliath.dm

* Add lavaland_surface_elite_crevice.dmm

* Load elite.dm and elite_goliath.dm

* Add Glowing Crevice Ruin

* Add elite_lavaland_monsters.dmi

* Additional Sprite to artefacts.dmi

* Updated elite_goliath.dm and elite.dm

* Add actions_elite.dmi

* Cleaned up Code with help from reviewers

* Getting Jiggy with timers

* Update lavaland_surface_elite_crevice.dmm with MapMerger

* Update actions_elites.dmi for Pandora

* Add pandora.dmi

* Remove Old Icons File

* Update elite.dm, elite_goliath.dm.  Add pandora.dm

* Load Pandora.dm

* Update actions_elites.dmi

* Add legionnaire.dmi

* Update Old Files, add legionnaire.dmi

* Load legionnaire.dm

* Update All Files, Add herald.dm

* Update actions_elites.dmi

* Update legionnaire.dmi, Add legionnaire_bonfire.dmi and herald.dmi

* Load herald.dmi

* Delete elite_goliath.dm

* Update elite.dm, pandora.dm, legionnaire.dm, and herald.dm.  Add goliath_broodmother.dm

* Delete lavaland_surface_elite_crevice.dmm

* Add lavaland_surface_elite_tumor.dmm

* Update lavaland.dm

* Delete elite_lavaland_monsters.dmi

* Delete herald.dmi

* Delete legionnaire.dmi

* Delete legionnaire_bonfire.dmi

* Delete pandora.dmi

* Add lavaland_elites.dmi

* Add tumor.dmi and legionnaire_bonfire.dmi

* Update actions_elites.dmi

* Stop loading elite_goliath.dm, start loading broodmother.dm

* Load goliath_broodmother.dm, not broodmother.dm

* Update all Elite Files for Loot Drops

* Add elite_trophies.dmi

* Add hope sprites to accessories.dmi

* Update neck.dmi

* Update elite.dm

* Update screen_objects.dm

* Add lavaland_elite.dm

* Add screen_elite.dmi

* Load Lavaland Elite HUD

* Update actions_elites.dmi

* Change the Death-Detection to be Tumor-Based, not Elite-Based

* Fixing a few rare runtimes

* Update herald.dm to comply with the obj/projectile change

* Ups the cost of the tumor ruin from 0 to 5

* Implement fixes suggested by AnturK

* Compliance to the new curazzy mob verb system

* Recompliance the whole projectile change thing

* Fixed Up Elite Files Based on Antur's Suggestions

* That's why shooter was needed

* Let's get rid of shooter

* Commit changes suggested by Fox-McCloud

* Forgot a )

* Remove a H.

* Update elite.dm, herald.dm, and pandora.dm

* Add Hope's positive mood effect

* Consider neck slot item when calculating armor and for block chance

* Fix human_defense.dm

* Fix Inconsistent Indentation

* REALLY Fixin' that Indentation

* Had to find some obscure thing to fix so Travis would check us out

* While we're still here, fix this off-pixel

* Background icon fix

* This somehow got left out during the changes

* Update to elite files

* Update the Description of the Herald
2019-10-22 14:58:08 -07:00
Qustinnus
b021210a2f [READY] Adds a basic skill framework to Physiology. (Only applied to mining) (#46913)
* levels

* mining

* ore exp

* fixes

* epic

* Update code/game/turfs/simulated/minerals.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* fixes message

* dumb

* shreet

* epic

* fix

* ass

* scrape

* fixes bugs

* fixes

* reset

* test

* ??

* ok bye

* fix

* Adds skills

* skill
2019-10-18 19:59:35 -04:00
Emmett Gaines
8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
Mickyan
a4385c7c64 sanity hud (#46805) 2019-10-07 15:54:18 -04:00
ShizCalev
d4a3f06ecb Merge pull request #44666 from Arkatos1/SlimeHUD
SlimeHUD
2019-06-20 18:09:42 -04:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
Arkatos1
2b8baf88ca SlimeHUD 2019-06-19 21:21:45 +02:00
Razharas
c55145299a Componentizes menucrafting (#44221)
Fixes menucrafting opening a new window when finishing construction
2019-06-04 17:01:45 -04:00
bgobandit
aeb603cb40 Clicking the health doll lets you examine yourself for injuries (#42357) 2019-01-15 17:12:29 -05:00
Qustinnus
c7f18988db Adds icon for sanity (#41141)
cl Floyd / Qustinnus (sprites by Mickyan)
fix: sanity can now reach its highest level
imageadd: Adds HUD icons for sanity
/cl
2018-10-27 13:19:33 +13:00
ShizCalev
c8ca0c5d74 Fix canequip() bad arg runtime (#40767)
keyed arg 4noraisin
2018-10-08 18:32:29 -07:00
Emmett Gaines
0943e56e08 Adds the signal origin as the first arg to all signals (#39861)
* Adds the signal origin as the first arg to all signals

* Fixes some storage and nanite procs
2018-08-28 18:28:29 +03:00