Commit Graph

60 Commits

Author SHA1 Message Date
Jack Edge 054647c382 Refactors container_type into reagents.flags 2018-12-18 13:47:11 +00:00
Jack Edge d93a0de984 Printed oxygen/plasma tanks no longer contain oxygen/plasma
🆑 coiax
fix: Printed oxygen or plasma tanks at the protolathe are now empty.
/🆑

The discrepency in behaviour was because the new /empty types were
using Initialize, which for some reason wasn't working.

However, when I ported the whole of /obj/item/tank into using
Initialize() it works fine, and all the empty tanks are empty
as intended, (and the ones that should have gas, do have gas).
2018-12-13 18:38:19 +00:00
tralezab 52a3400de4 Merge remote-tracking branch 'upstream/master' into patch-12 2018-12-09 15:17:16 -08:00
HideAndSeekLOGIC 04276d13f9 [READY] Allow creation of the various types of emergency oxygen tanks (#41672)
[Changelogs]:

cl HideAndSeekLOGIC
add: Added emergency oxygen tanks and extended capacity emergency tanks to the autolathe and protolathe
add: Added them to the Industrial Engineering tech node
tweak: Only Cargo and Engineering can print extended capacities; the rest are available for everyone.
/cl

There is currently no way to produce these tanks and there is currently no reason why this should be the case. This PR fixes this problem.
2018-12-09 23:52:30 +13:00
Jordan Brown e9d217c7e7 Merge pull request #41701 from anconfuzedrock/smalltanks
[review would be kinda sweet] reduces the maximum capacity of small oxygen tanks, while retaining their base volume.
2018-12-02 09:31:24 -05:00
YoYoBatty 34fb29af61 Improvements to jetpack code (#41681) 2018-11-28 22:48:13 -05:00
anconfuzedrock d6135ae60c makes small tanks start full, makes full the same amount. 2018-11-26 16:54:38 -05:00
ninjanomnom f5bad18e93 Converts jetpack speed modifications to the new system 2018-11-14 04:04:56 -05:00
Denton d8cb048f75 Removes redundant assert_gas 2018-10-24 10:22:45 +02:00
Denton 6e1ed5f670 Adds oxygen and plasma tanks to techwebs 2018-10-23 07:57:12 +02:00
Mickyan d1b10b2691 Vendor tweaks & prices: take 2 (#40927)
* vendor tweaks

* i was never good at cooking

* soda

* boozeomat sorting

* updated ramen desc
2018-10-22 08:40:24 +13:00
ShizCalev b7739a4a23 Standardizes bomb logging (#40474)
Fixes #39976

A good number of things were missing various parts of the logging (going to GLOB.bombers, not going to client logs, not logging to game, ect), or doing incorrect things like passing admin verbs to saved logs.

Unified all the necessary actions under a single proc log_bomber() which handles everything in most use cases. This way the log isn't all jumbled up with inconsistent messages, everything's one format so you can quickly find what you need to bwoink the right person.
2018-10-01 15:03:00 +13:00
cacogen 00feea5594 Janitor balance changes (#40141)
cl cacogen
balance: Space cleaner in spray bottles travels 5 tiles instead of 3 (doesn't affect other reagents)
balance: Trash bag fits in exosuit slot of janitor biosuit
balance: All soaps are faster
balance: Soaps now clean all decals on a tile instead of just one
balance: Soap now has limited uses (100 for most, 300 for NT brand which janitor gets)
balance: Mops are considerably faster
balance: Basic mop holds twice the reagents
balance: Janitorial cart now refills mops completely with one click
balance: Basic and advanced mops are more robust (8 force and 12 force)
balance: Galoshes no longer leave bloody footprints
balance: Chameleon noslips no longer leave bloody footprints
fix: Bulb boxes can be used on light replacers refill them in bulk
balance: Light replacer can be used in-hand to change all bulbs on a tile
add: Custodial barrier projector which creates solid wet floor signs that force people to walk to pass (available through service protolathe)
/cl

Janitor's been an exercise in futility for years, and the job is made redundant by janitor cyborgs who can't even keep up with the mess themselves. Spreading blood is instant, but takes a lot longer to clean. The goal here is to make it easier to keep up with the mess and make the controls less finicky while avoiding affecting combat too much (the mop and spray bottle are is a good weapons after all).
2018-09-28 09:21:14 +12:00
Cw 3040 c70a956703 Adds Improvised Jetpacks (#40060)
* Adds Improvised Jetpack

-requires two RED oxygen tanks (they have to be RED goddamnit), one fire
extinguisher, three pipes, and thirty cable coils.
-volume less than 1/3 of regular jetpacks
-starts empty
-looks like a red jetpack

* I think this is how you do it

-new sprite courtesy of Obscolene
-i actually don't know if this is the right way to add sprites please
don't yell at me

* adds random chance for jeptack to cut out

-1 in 250
-it's more annoying than anything
2018-09-09 17:49:22 +03:00
intrnlerr aa93562062 Fix tank temperature check checking pressure instead (#39805)
Makes temperature actually temperature.
2018-08-20 23:14:36 -07:00
AnturK b6338a8623 Fix watertank runtime (#39703) 2018-08-15 12:42:42 -07:00
Tad Hardesty 6e72c777bf Fix backpack water tank behavior, related fixes 2018-06-30 14:49:13 -07:00
kevinz000 961fbfc99a Fixes and adds blast cannons to traitor science uplink items (#38093)
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-22 11:38:29 +12:00
Tad Hardesty 0bac7887b1 Fix being able to pull mirage borders, others 2018-06-14 21:39:32 -07:00
vuonojenmustaturska c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
ShizCalev c41d6ac965 Standardizes and cleans up some admin messages & logging (#38128)
* Improved logging

* Fixes & emitter logging

* ded
2018-05-30 21:57:06 -07:00
cyclowns 49b4aa928e Buffs atmospheric analyzers to show mole count, volume and higher degrees of precision (#37631)
add: Analyzers can now scan all kinds of atmospheric machinery - unary, binary, ternary, quaternary, you name it. This means stuff like gas pumps, gas mixers, vents and so forth can be analyzed.

tweak: Analyzers now show temperature in kelvin as well as celsius.

tweak: Analyzers now show total mole count, volume, and mole count of all gases.

tweak: Analyzers show everything at slightly higher degrees of precision.


More accurate and advanced analyzers have been something that I think atmos and toxins mains have been wanting for a while now (including myself). It's always a pain to have to manually add 273.15 to every celsius temperature, or have to use outside tools or VV (which isnt usable in actual games) to calculate mole count for a gas mixture. Not to mention, the ability to analyze things like volume pumps and gas filters makes it easier to manage larger atmos setups. This is just a QoL change for people in any of those jobs. In fact, most players probably don't even know what the fuck is a mole is so adding mole readout to analyzers is a good way to get people to understand atmospherics better.
2018-05-23 13:38:59 +12:00
YPOQ ca48bb45bf Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-12 22:05:35 -07:00
vuonojenmustaturska 98f8ca7553 Moves several clothing-specific flags from /atom to their proper type (#37486)
* lavaproof

* more flags

* it compiles

* Remove a couple of lists
2018-04-28 13:22:28 -05:00
as334 7d32eba2a1 Re-adds and reworks fusion. (#37384)
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 18:01:39 +12:00
AnturK 52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK 4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud 057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
kevinz000 f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
XDTM 5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
ShizCalev 9c859dc289 Makes tanks made of metal 2018-01-15 12:45:08 -05:00
JJRcop 1b1287e009 Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 11:03:28 -02:00
oranges fc9b7eca53 Merge pull request #33622 from duncathan/assert_gas
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 17:45:39 +13:00
ACCount 40699a8aea [READY]Refactors reagent container types (#33470)
* Replaces a bunch of manual OPENCONTAINER checks with helper procs

* Removes unnecessary vars

* Updates reagent bitflags, adds some new ones

* Replaces most of the is_open_container calls with more specific ones

* Puts new AMOUNT_VISIBLE flag to use

* Uses new helper procs in more objects

* Standardizes chemicals logging

* De-snowflakes two more checks

* Fixes

* Minor fixes and improvements
2017-12-18 22:55:01 -06:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
duncathan 8172ecb632 restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs 2017-12-17 04:39:08 -06:00
vuonojenmustaturska 5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
vuonojenmustaturska a162837faf Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
* big batch of loc assignments

* Update emergency.dm

* Update spiders.dm

* Update parrot.dm

* Update ripley.dm

* Update firealarm.dm

* seems to work

* this maybe works?

* brainmemes, again

* stuff

* fix brainmob, camera runtimes
2017-12-13 20:56:39 +01:00
FrozenGuy5 0429c45b87 Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 12:29:20 -05:00
Tad Hardesty 54630b7c48 Remove NODROP from water tank misters (#32995) 2017-11-24 06:05:30 -05:00
Emmett Gaines 7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom 2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev 02abe5d92f Makes drinking glasses smash when thrown (#32890)
* Makes drinking glasses smash when thrown

* Maintains bartender snowflake behavior

* Extended to all bottles, cartons, cleaned up 1 & 0

* Corrected breaking bottles on heads.

* Reduced glass spawn chance to 33%
2017-11-20 09:45:08 +01:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
as334 f71595a3e2 Assmos tweaks/minor additions. (#32400)
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:30:36 -06:00
AnturK 83e177e43c 512 experimental (#31251)
* 512 update

* Travis update

* Fixes mass replace mixup
2017-10-28 17:20:04 -04:00
Jordan Brown 04c05d8e5c Adds defines for organ slots (#31737) 2017-10-15 20:33:35 -04:00
duncathan salt 454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
vuonojenmustaturska 890ba9dbe1 Imminent danger of skeletons
* Renamed GASLIST into ADD_GAS
* Reordered ASSERT_GAS arguments around
* Replaced all instances of add_gas with the define
* Removed once instance of manual duplication of ASSERT_GAS with the real deal
2017-10-07 04:34:24 +03:00