Commit Graph

458 Commits

Author SHA1 Message Date
Dwago
72f62044db Bug fix's! (#5338)
Fixes #5426
Fixes #5322
Fixes #5245
Fixes #5310
Fixes #5416
Fixes #5412
Fixes #5410
2018-10-21 12:33:42 +03:00
BurgerLUA
4319c45133 Thirst Mechanics (#5255)
Overview
Adds thirst mechanics. Thirst mechanics work exactly like hunger mechanics where if you don't drink enough liquid, you become thirsty and move slower. Several other mechanics involving drinks were also changed.

For organic races, you gain hydration by consuming beverages and water. Water is the most effective way of hydrating yourself. IPCs are not affected by hydration and do not have to worry about it. If you overeat or overdrink, your nutrition decreases faster until you are of normal hunger and thirst levels.

Penalties for not eating or drinking are now more severe. If you refuse to drink or eat all shift, you will be up to 33% slower and take twice as much pain damage. The amount scales based on your hunger or thirst levels. If you are considered hungry or thirsty, it starts scaling until you're starving or seriously dehydrated. If you overeat and overdrink as well, you get a ~5% reduced movement and pain tolerance with each mechanic.

The icons for hunger have been updated to be more specific, and they match the new thirst indicators as well. https://i.imgur.com/QQbWxYI.png

You can now also inject beverages into your blood for x4 effectiveness. Before, IV dripping yourself with vodka did nothing but give you a small amount of toxins, but now it should be a hell of a party.

Dionaea can now be affected by beverages with respect to nutrition gains and temperature changes. Dionaea cannot be affected by some effects, such as stuttering and intoxication, still.

Healing effects for certain beverages (tea, milk) were removed. This a HRP server, milk shouldn't heal you.
2018-10-07 00:14:47 +03:00
BurgerLUA
ac193dc469 Disposals Map Overhaul (#5197) 2018-10-01 19:52:07 +02:00
Werner
0feedab118 Leyon Changes (#5200)
The Leyon Pistol has been changed to be closer to the original vision of it.
It is loaded via a special 10mm speedloader, however loading it takes some time.

Each gun (when ordered via cargo) will ship with a speedloader.
The speedloaders itself can not be ordered, but 10mm ammunition boxes can which can be used to restock the speedloaders or load the gun directly.

Reduces the price for the gun at the merchants from 1500 to 500 credits
And makes additional ammo boxes purchaseable

Also changes the path name of the 10mm ammo/mags/... to be consistent with the standard pathing for ammo
Adds additional messages if you can not load a gun with a single cartridge (currently it fails silently)
2018-09-16 00:46:52 +03:00
BurgerLUA
e0430c1bdc [REVIEW ME PLS] Battle Monsters Card Game, or the last* PR. (#5141)
Overview
Adds Battle Monster cards. Battle Monsters is a collectable card game clone like Yugioh or magic the gathering. Players can purchase card packs and use them in games with actual rules to them.

Checklist
Card Generation Framework: 100%
Sprites: 80%
Game Rules: 90%
Deck Framework: 5%
Monster Cards: 20%
Spell/Trap Cards: 5%
Obtainable Status: 0%
2018-09-02 20:54:27 +03:00
skull132
b6e8ae4d53 Merge branch 'master' into development
# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm
2018-08-05 20:29:03 +03:00
BurgerLUA
8519dcc393 .loc = to forceMove() (#4937)
As requested, this PR is changed to only include all .loc = to forceMove() changes.
2018-08-04 01:48:58 +03:00
BurgerLUA
d93d155fdd Kinetic Accelerator Additions (#4965)
I want mining to be able to find some unique, powerful kinetic accelerators while out on the dig. Most of these are pretty high tier (Class B to S, or BS for short) and should be great finds for miners.

I also made it so that you can only pump the assemblies if you have two hands, and some kinetic accelerators are just too heavy to fire with one hand.
2018-08-03 00:15:55 +02:00
Alberyk
0b2ea5f78a July update: vaurca and mining fixes (#5047)
-fixes #5046
-fixes #5037
-fixes #5036
-changes that you can only climb walls by being in the grab intent, to avoid falls by accident when clicking a wall
-changes the cooldown of the warform at bygone's request
2018-07-29 02:31:33 +03:00
LordFowl
e7fc543189 July Update Bugfixes: Better Than Alberyk Edition. (#5031)
Fixes #5030
Fixes #5028
Fixes #5040
Fixes american flags not showing up
Fixes gauss rifles being overpowered

I may add more bugfixes with this PR if anything juicy comes up.
2018-07-23 22:57:00 +03:00
LordFowl
76372c4b15 [Ready for Review] Unapologetic Vaurca Buffs III: Revenge of the Buffs (#4885)
Implements various changes at the behest of lore-dev BygoneHero, namely:

Vaurca can now wear specially modified softsuits.
Vaurca now have their own special rigsuit a la the breacher: the combat exoskeleton. It comes with various special modules, including a boring laser that allows them to dig below themselves rapidly, a vaurca variant of the combat injector which includes phoron and k'ois paste, and a neural lattice which reduces halloss by sharing it with everyone else wearing a neural lattice.
Vaurca also have received various other currently unavailable event items, including a variant of the tactical mask that filters out nitrogen and allows the Vaurca wearing it to eat, tachyon rifles and carbines which penetrate up to three layers of walls and possess other fringe benefits, the gauss rifle which is a semi-automatic variant of the crossbow with greater power and a 6 rod magazine, the energy zweihander, commando armor and scout armor.
Introduces a general climbing mechanic. Climbing can be initiated by clicking on a wall or an open turf, and it is a percentage chance that is modified by the amount of stable/large items beneath you, and decreased by the amount of unstable/small items. Vaurca are naturally proficient and always succeed at climbing.
Changes Vaurca to see in blue-green vision. Their vision is generally brighter and reddish colors are converted to a blue-green color.
Adds the Sedantis flag, an interhive flag that celebrates the universal longing for Sedantis and is a symbol of the Vaurca diaspora.
2018-07-22 19:17:03 +03:00
Erki
3d848e7cee Fixes "3" (#4993)
In converting some things from show_message to visible_message, people forgot that the 2nd argument is not range. But is instead, either blind message or user message. So I fixed it. Also added some high lighting and user messages.
2018-07-21 14:07:12 +02:00
BurgerLUA
15b42a92aa Kinetic Accelerator Tweaks (#4949)
The results are in: Science doesn't always provide mining with kinetic accelerators. As a result of these findings, high level kinetic accelerators now have increased drop chances in the warehouse and in abandoned crates.

Also, kinetic accelerators no longer dig holes.
2018-07-20 21:30:51 +02:00
skull132
59a69716d8 Merge branch 'master' into development 2018-07-17 23:23:02 +03:00
Alberyk
f2d48983c4 Bug fixes: trial by fire (#4990)
-fixes #4697
-fixes #3913
-fixes #3216
-fixes #1854
-fixes #901
-fixes #1597
-fixes #4469
-fixes #1215
-fixes #3681
-fixes #3567
2018-07-17 22:55:01 +03:00
skull132
8348bf711c Merge branch 'master' into development 2018-07-14 15:01:05 +03:00
Lohikar
a15aa07307 Fix Phantom Globals (#4957)
Removes the phantom global definitions that Fowl found.

Fixes:

Game log in GELF not logging proper target.
Pylon attacks not detecting the actual firer of a damaging bullet.
A message in the mixer cooking machine.
A message in airbubbles.
A use_check sanity check in landmines.
Some messages in psych therapy code.
A view() checkk in psych therapy code.
CCIA being unable to announce incoming faxes in some circumstances.
Language whitelists potentially checking the whitelists of the last person to throw a tray in addition to the pref mob.
Fixes some messages/sounds with some custom items.
Fixes a message with digging into the asteroid.
Fixes electrocution code not properly checking for absurdly long hair.
Fixes a broken message in devour.
Fixes a targeting issue with player-controlled hostile ranged mobs.
Fixes failure behavior for modular RnD guns.
Fixes an intent safety check on gun aim.
Fixes the Harvester knock spell potentially not working.
2018-07-01 22:47:58 +03:00
skull132
7cd79c4ce5 Merge branch 'master' into development 2018-06-30 20:33:51 +03:00
LordFowl
5d983a1b59 it was a mistake (#4913) 2018-06-26 17:01:41 +02:00
Alberyk
0654f921d9 June update fixes (#4905)
-fixes the catbeast plants missing from botany
-fixes a runtime on the minigun
-fixes #4870
2018-06-18 21:53:11 +03:00
BurgerLUA
9da929d4a1 Custom Kinetic Accelerators (#4802)
This is honestly one of my biggest and most ambitious projects. I hope people are happy with this.

Custom kinetic accelerators are special, customizable mining weapons that are meant to give a sense of progression, and a sense of pride and accomplishment while mining. Each custom KA is made up of 3 or 4 parts:

The Frame (5 to choose from)
The Cell (5 to choose from, +1 traitor)
The Barrel (5 to choose from, +1 traitor)
The Upgrade Chip (7 to choose from, +1 traitor)
The sprites change with each addon, they are truly dynamic and there are so many combinations of parts that a miner can have. You can have several different builds for each desired mining style, it's quite a robust system.

You can have a KA that shoots slowly, but delivers high-penetrating shots that go through several walls of rock. You can have a KA that shoots REALLY fast, but precisely destroys 1 rock at a time. You can have an absolute canon of a beast, that destroys rocks in a 3 tile radius around it.

The parts can be obtained via research, via abandoned crates, or via RNG in the cargo warehouse. There are some custom KAs that spawn on the raider's ship, on the mercs ship, and a laser one on the merc's headquarters. That laser one can also be bought from the traitor uplink as well.

ERT get a class 4 KA for use in special operations, if they choose to use it.
2018-06-17 23:02:42 +03:00
skull132
a2fc4f1876 Merge branch 'master' into development 2018-05-07 18:16:22 +03:00
BurgerLUA
c11d7ac148 Fixed the Stack Machine from eating Materials (#4688)
The stacker was coded to accept 1 sheet at a time, meaning that if you insert a stack of 50 sheets into the stacker, it will count that as only 1 sheet because people don't know how to code.
2018-05-06 17:21:05 +03:00
Lohikar
da3af646d6 Bolt-action refactor (#4667)
Makes bolt-action rifles a child of pump-action shotguns again to remove some shared code.
2018-05-02 21:24:32 +03:00
Alberyk
d198ee0568 Adds the magic poppet (#4637)
This pr adds a magic poppet, a doll that can be infused with some spessmen's blood to bind them to it. From there, the person can mess with the dolls in some manners, and fun things will happen to the unfortunate victim of said sorcery. Added to some wizard spellbooks and a mining abandoned crate.
2018-05-01 13:24:18 +02:00
BurgerLUA
e8d22ed53d Cargo/Mining Map Tweaks (#4542)
Mining Map Changes
There is an easier way for paramedics/miners to traverse down zlevels, without the using of a mobile ladder. A new area is built for that purpose. Main level has a ladder going up and down to two different areas. Both areas are guaranteed to be connected to another airlock. Top level is connected to science, bottom level is connected to a cargo elevator. Atmospherics system in mining is more saner. The mining processor was made shorter, and 4 grates are guaranteed to spawn now for each miner slot, and contains it's own maintenance hatch for easy upgrades. Mining also now has its own requests console and disposals delivery destination. The industrial smelter is now twice as fast, however uses three times as much power.
2018-04-08 11:07:06 +03:00
LordFowl
30039435a4 Footprints in the Ash (#4484)
Ash will now track onto a user's boots, creating footprints in both the ash and any subsequent tiling the user steps on. Currently these footprints use the track template that blood uses, and indeed are a subtype of blood-tracks. The result is perhaps not the best sprite. Even so, I thought it at least a worthy experiment.
2018-04-01 00:44:16 +03:00
BurgerLUA
7d83324a27 Miscellaneous Tweaks (#4362)
Overview
This is just a misc fix PR to minor annoyances I encountered while playing on the server. This fixes the following:

Resisting from a chair unrestrained no longer adds a cooldown to activating objects.
Action figures are no longer massive, and only take up 1 slot in your inventory.
Boxing gloves can now be worn by any race.
The ore summoner can only move up to 10 ore at a time.
2018-03-18 00:50:46 +02:00
Lohikar
a86398d0d2 Code Cleanup: (Bump(), Bumped()) -> (Collide(), CollidedWith()) (#4349)
This PR rips out the old Bump() and Bumped() procs and replaces them with Collide() and CollidedWith() respectively. Behavior should be the same, but Bump() should no longer be double-called, and no longer relies on spawns.

Other changes:

LAssailant is now a weakref.
Some direct loc setting are now forceMove().
2018-03-08 09:39:53 +02:00
Lohikar
d02c9551fd Map & Ore sanity (#4321)
changes:

SSatlas will now warn if it detects a compiled-in map.
The asteroid gen no longer stops working if no smelter is mapped in.
Multiple smelters can now be mapped in without all but one being nonfunctional.
2018-02-26 21:27:17 +02:00
Lohikar
27f3df6929 Asteroid sprite fixes (#4276)
changes:

Replaced some bad references to the old asteroid turf type.
Fixed an issue where asteroid walls being mined down would always spawn the ash variant instead of rocky where appropriate.
Changed the abstract asteroid turf type to have a unique debug texture & description to make it more identifiable.
Debug tex (from TG):
2018-02-10_17-52-39

Fixes #4275.
2018-02-11 02:16:42 +02:00
Erki
6fe90002dd Up-hint and UI cleanup (#3773) 2018-01-27 12:11:22 -06:00
Lohikar
ac6ed6be7c Decal tweaks (#4126)
changes:

The asteroid now has random rock decals.
Ported TG's improved corner decals.
2018-01-23 16:10:23 +02:00
Alberyk
92df6286e5 Tweaks lava interaction and fixes the missing openspace_override_type (#4087)
-tweaks a bit more how lava do damage
-fixes the missing openspace_override_type that were removed on accident
2018-01-20 23:41:54 +02:00
LordFowl
148ba78e64 Unapologetic Janitor Buffs (#4006) 2018-01-15 21:25:22 -06:00
Alberyk
005f7f8c30 Adds lava interaction (#4037)
Adds lava interaction: humans walking on lava titles will suffer a slowdown then being set on fire, cyborgs and simple mobs will only take burn damage.

Added the lava and basalt turfs to a random map generator, and replaces the tundra's ocean with the title just named water.
2018-01-07 11:21:42 +02:00
Lohikar
6f85f08718 Convert a bunch of legacy overlay calls to SSoverlays (#4015)
Bunch of overlay conversions I found in an old stash I had forgotten about.
2018-01-07 00:34:47 +02:00
Lohikar
ddd7748903 ChangeTurf tweaks (#4036)
changes:

Lighting's ChangeTurf() override has been merged into the base ChangeTurf() proc.
Turfs can now set an alternate openturf type to be used instead of the default one when ChangeTurf(/turf/space) or ChangeToOpenturf() is used.
Added ChangeToOpenturf() helper.
Added a missing dig icon state to the rocky ash DMI.
Fixed an issue where the above var was not properly carried over on ChangeTurf().
Fixed an issue where Z-mimicing turfs would not be notified of their below turf ChangeTurf()ing unless they were an openspace.
2018-01-06 11:53:18 +02:00
Lohikar
06514840f7 Z-Mimic (#3907)
* Openturf icon fixes and improvements

* more things

* Remove some pointless/bad layering/planing

* yeah well I didn't need this anyways

* Refactor Z mimickry to be at /turf

* more refactoring

* Cleanup, use turf/flags instead of z_mimic_flags

* Fix turf/Entered()

* misc optimizations

* fixes

* Major icon smoothing optimizations

* Speed up boot some more

* Fix AO

* Remove some redundant code

* Tie Z-lights to Z-mimic instead of openturfs

* Fix an opacity issue with no_mutate turfs

* Fix some issues with Z-mimic AO not properly clearing

* Fix some OT->OT changetuf bugs

* Add helpers for changing Z-mimic operational state on turfs

* Fix some merge issues, change how F_CUT smoothhint works a bit.

* indentation

* SSopenturf -> SSzcopy
2017-12-30 04:42:18 +02:00
Lohikar
3b19323055 Basalt turfs (#3985)
changes:

Adds three new turf types: lava (separate from the existing lava which is bound to the flooring system), basalt (a child of asteroid turfs), and chasm open spaces.
canSmoothWith lists on asteroid turfs are now in the form of a shared global list for performance reasons.
'Ash' turfs have been repathed to /turf/simulated/asteroid/ash. Base asteroid turf type should not be used directly anymore; maps have been updated to new path.
Airless openspace, chasms, and airless chasms now have map-time debug icons.
No player-visible changes, just prepwork for future things and performance tweaks.

Sprites from TG.
2017-12-24 22:30:36 +02:00
skull132
9faccd5e61 Merge branch 'master' into development
# Conflicts:
#	html/changelogs/.all_changelog.yml
2017-12-23 21:37:36 +02:00
Lohikar
bb5a34eaf8 Misc. Optimizations (#3993)
changes:

Overlays now creates less temporary lists.
Falling no longer queues unsimulated atoms that wouldn't fall anyways (incl. LOs).
Pixel-shifted AO is now cached too.
Changed some references to get_map_cell() to macro equivalents in random maps.
Added smoothing hinting to the icon smoother, allowing for major performance improvements in common cases.
Space initialization no longer involves appearance churn (and is much faster as a result).
2017-12-23 21:27:51 +02:00
Lohikar
f73849368f Make get_smooth_underlay_icon work properly with space parallax (#3906)
Fixes an issue where space underlays on diagonally smoothed turfs would not work properly with space parallax.
2017-12-18 00:20:35 +02:00
LordFowl
f8daffdcfa Tidies up Mine Drones and Gifts (#3930) 2017-12-13 17:14:48 -06:00
Lohikar
cd910c072c Asteroid tweaks (#3951)
changes:

Z-levels below the surface now use 'rocky' ash instead of ash turfs. (Sprites from TG)
Fixed an issue where openturfs would incorrectly inherit their mimiced turf's gender.
Tweaked the names & descriptions of sand (now ash) and rock.
Reduced some pointless locate() calls in icon smoothing code for turf paths.
Replaced the empty space map with runtime Z expansion.
Fixes #2756.
2017-12-10 00:20:35 +02:00
skull132
d536d9f4aa Merge branch 'fake-master' into development
# Conflicts:
#	code/ATMOSPHERICS/atmospherics.dm
#	code/defines/procs/announce.dm
#	maps/aurora/aurora-3_sublevel.dmm
2017-12-09 00:08:21 +02:00
Lohikar
82f347040b Stacker fixes (#3903) 2017-11-25 21:30:21 -06:00
Lohikar
f53c99bea4 Add map laceholder objects for mine turfs (#3828)
changes:

Mine turfs now use a 32x32 icon on the map to make them easier to map with. In-game behavior (should be) unchanged.
2017-11-18 18:46:59 +02:00
skull132
c0f22a1cdd Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-1_centcomm.dmm
2017-10-29 16:15:53 +02:00
Lohikar
fc78e49b14 Fix AO being broken on ChangeTurf() (#3732)
Fix AO being broken on ChangeTurf()
2017-10-22 17:53:39 +03:00