Commit Graph

3008 Commits

Author SHA1 Message Date
Atermonera
9580d9725c Merge pull request #7502 from Meghan-Rossi/ducttape
Fix duct tape on self
2020-08-20 19:23:18 -07:00
Atermonera
b2b2fd6698 Merge pull request #7469 from Rykka-Stormheart/shep-dev-toy-mech-battles!
Adds Mech Toy Battles!
2020-08-20 18:52:58 -07:00
Atermonera
4a56ad2191 Merge pull request #7449 from Cerebulon/vendEnhance
Flavour Enhancement: Vending
2020-08-20 18:23:54 -07:00
Mechoid
9ec10f97c8 Reagent Hoses (#7386)
* Starts work on basic reagent hose machinery.

* Continue Work, Add Spray Nozzle

* Tubing is craftable.

* Changeling

* Upkeep

* TRUE
2020-08-20 18:22:39 -07:00
Atermonera
af81780ba7 Merge pull request #7397 from ShadowLarkens/tgui4.0-and-camera-console
TGUI 4.0 and camera console
2020-08-20 17:52:17 -07:00
Meghan-Rossi
896870ae1b Fix duct tape on self
Fixes https://github.com/PolarisSS13/Polaris/issues/7501
Also slightly refactors duct tape code.
2020-08-14 23:02:34 +01:00
Rykka
98c07231e2 Rename toy/mech to toy/mecha to match mecha code. 2020-08-12 20:13:45 -04:00
Greenjoe12345
ed74e52130 ports a whole lot of Teshari stuff from Arkstation (#7431) 2020-08-12 11:16:42 -07:00
Rykka
13263b41a5 Adds Mech Toy Battles!
Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station. You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech.

Each mech has its own health stat and special ability that they'll use in combat against each other. How exciting!

Also slightly refactors toy locations and changes toy mechs from being JUST prizes to their own proper toy subtype!

Upstream of https://github.com/VOREStation/VOREStation/pull/8665
2020-08-12 04:38:30 -04:00
Cerebulon
cbce774745 typos, lighters, trash 2020-08-10 01:27:30 +01:00
Cerebulon
3f8c0602ae ecig text 2020-08-09 05:33:57 +01:00
Cerebulon
0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
ShadowLarkens
7349c62356 Merge remote-tracking branch 'upstream/master' into tgui4.0-and-camera-console 2020-08-06 21:29:47 -07:00
Atermonera
1fc6477d5e Merge pull request #7393 from Rykka-Stormheart/shep-dev-tg-alerts-updoot
Port lots of things that had to wait on alerts (Replaces Arokha's PR)
2020-08-06 11:38:16 -07:00
Mechoid
282b42dbc1 Exosuit Modular Internals, The Squeakening (#7329)
* Begins work on internal exosuit components, similar to Borgs.

* Large volume of work on exosuit components, Durand is tweaked to be higher cost in time and resources, since it requires AP to damage, without ions or explosives.

* Component Sprites

* Actually implement component repair, I knew I missed something.

* Magic numbers, properly typed lists, and indentations oh my

* Changeling
2020-08-05 16:20:46 -07:00
ShadowLarkens
971a95bc0a TGUI 4.0 & Camera Console 2020-07-30 17:48:11 -07:00
Rykka
28a7698b9e Port lots of things that had to wait on alerts
Adds a HUD for observers
Adds a HUD for rigs and mechs
Adds up/down buttons for AI hud
Add more tg style alerts
Fix some bugs with the tg alerts
Improve icon_states usage by caching it
Redo how respawning works, add a button to ghost hud for it
2020-07-30 16:23:32 -04:00
Atermonera
d0037676e1 Merge pull request #7344 from Rykka-Stormheart/shep-dev-aurora-cooking
Aurora Cooking Port
2020-07-30 12:13:07 -07:00
Cerebulon
03b7a0ea0d Persistent Trash/Dirt/Graffiti/Notices (#7337)
* Port Trash/Writing Persistence from World

* stuff beyond straight portin

* Fixed admin menu

* Config, cigbutts, blood exceptions, offices....

* mapped butts
2020-07-24 02:23:34 -07:00
Rykka
b367193908 Huge Bundle of Fixes, Update Cooking to current Aurora
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
2020-07-22 21:45:03 -04:00
Schnayy
9b5c2222a8 Merge pull request #6799 from Cerebulon/booksprites
New book sprites + inhands
2020-07-09 16:32:01 -05:00
Atermonera
1bcb649378 Merge pull request #7262 from lolman360/master
fixes hybrid crowbars
2020-06-04 19:25:35 -07:00
Rykka Stormheart
9917f31031 Merge branch 'master' into shep-dev-upstream-screenport 2020-05-30 06:54:08 -04:00
Atermonera
210daadda5 Merge pull request #7218 from VOREStation/Arokha/traps
Traps don't get weird with removed limbs
2020-05-29 22:54:15 -07:00
lolman360
b0d849e9eb e 2020-05-29 10:30:36 +10:00
Atermonera
6ab622a2b5 Merge pull request #7205 from VOREStation/Arokha/playsound
Alter playsound paradigm
2020-05-28 16:05:59 -07:00
Atermonera
551fc88ce1 Merge pull request #7204 from VOREStation/Arokha/performance
Performance improvements
2020-05-28 12:47:08 -07:00
Rykka
fc1d6e741c Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you to do custom hud alerts for any variety of things from "You're too cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. There's also a number of new alerts, such as blindness, highness, legcuffed, buckled, handcuffed, and probably some more I missed; read code/_onclick/hud/alert.dm and see for yourself!

Additionally, a number of tweaks have been done to resisting code, to make it so that there's an indicator when you're buckled or handcuffed, and can just click the alert to start resisting. This includes a refactor that combines the logic for lockers, holders all into one proc, called container_resist().

Also, the health and internals indicator got moved down one tile each. Needed room for the alerts. If we add the oxygen tank action buttons from /tg/ and remove the internals indicator, the health indicator can go back where it was originally.

Alerts, pictured in the top right.
![https://i.imgur.com/H7Bipci.png](https://i.imgur.com/H7Bipci.png)
2020-05-23 04:48:47 -04:00
Atermonera
656cbe79ea Merge pull request #7190 from VOREStation/Arokha/janicart
New janicart sprites/features
2020-05-22 17:37:28 -07:00
Aronai Sieyes
414c8e45ea Traps don't get weird with removed limbs 2020-05-21 15:33:01 -04:00
Atermonera
10870379f1 Merge pull request #7172 from lolman360/hyBRO-tools
Hybrid tools buffs.
2020-05-21 11:31:48 -07:00
Aronai Sieyes
30613fff5c Optimize what starts in SSobj (#7155)
* Make intercom power change stateful

* Clean up air tank processing and initialize

* Optimize flashlight processing

* Optimize suit cooler processing

* Optimize geiger counter processing

* Optimize lighting processing

* Only process rigs on a person

* One more rig cleanup
2020-05-21 11:28:27 -07:00
Aronai Sieyes
ad75bb86bd Alter playsound paradigm 2020-05-19 11:06:28 -04:00
Aronai Sieyes
07acd05537 Obsolete the PROXMOVE flag and uses 2020-05-19 10:39:44 -04:00
Aronai Sieyes
7a8126396e New janicart sprites/features 2020-05-17 19:07:28 -04:00
Atermonera
fcdbc41ffb Fixes Runtime in ,: bad arg name 'disable_warning' (#7162) 2020-05-15 13:37:14 -07:00
Aronai Sieyes
a8f3a0a7a0 Refactor move/click code 2020-05-15 10:49:27 -04:00
lolman360
630a3f608f Update screwdriver.dm 2020-05-15 09:36:38 +10:00
lolman360
883a730c64 Update weldingtool.dm 2020-05-15 09:36:17 +10:00
lolman360
1726728d0e Update wirecutters.dm 2020-05-15 09:34:58 +10:00
lolman360
edf7e92e8b Update wrench.dm 2020-05-15 09:33:36 +10:00
Aronai Sieyes
eff72a9850 Merge branch 'master' into pol-moved 2020-05-12 11:22:43 -04:00
Atermonera
eb8ad57917 Merge pull request #7135 from Rykka-Stormheart/shep-dev-hover-overlays
Port Hover Inventory and Body Indicators
2020-05-11 16:51:12 -07:00
Rykka
61ff2cbbce Earlyport Hover Inventory and Body Indicators
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) 
Body Selection parts.

![https://i.imgur.com/KbLqWKy.gif](https://i.imgur.com/KbLqWKy.gif) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port.
2020-05-10 08:09:24 -04:00
Aronai Sieyes
ffe54ca240 Redo teleporter control in nanoui 2020-05-07 21:13:27 -04:00
Atermonera
1cb60a41fa Merge pull request #7060 from Mechoid/LingFixes+OtherFixes
Ling Fixes + Various other fixes
2020-05-05 14:00:34 -07:00
Atlantiscze
c32112c69c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2020_04_17_LoadBalancing 2020-05-03 23:17:27 +02:00
Mechoid
aafd4b4fa6 Explorer Expansion: New Horizons (#6960)
* Large amount of work; Animal taming, shearing. Random animal spawns on sif grass/forest turfs. New PoIs, thermal poncho.

* Combat drone DMI moved to drones folder. Mining Drone subtype added. "Tameable" with ores, will collect and store ores when not in active combat.
2020-05-01 11:19:21 -07:00
Aronai Sieyes
6c6644f86c Rewrite examine() to pass a list around (#7038) 2020-04-29 13:42:16 -07:00
Mechoid
a5d0978773 Ling Fixes + Various other fixes, including non-suit suit icons, rollerbed inhands, ling thermals existing and working, ling locker/morgue revive. 2020-04-27 20:27:39 -07:00