Commit Graph

122 Commits

Author SHA1 Message Date
Emmett Gaines ffa5256ee3 set waitfor in final countdown (#37453) 2018-04-27 21:01:52 +03: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
Denton bba91375ac oof 2018-04-11 14:59:34 -05:00
Emmett Gaines 5dbc037d1d Makes sm delamination have a final countdown (#36977) 2018-04-11 15:10:49 +03:00
iksyp 910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
Spirono db046805f0 Wrench Supermatter Shard to the ground (#36991)
* Temporary concept code for PR

I doubt this code is the standard method of doing things, but trying to understand this code is a bit AIDS

* Using wrench_act() and default_unfasten_wrench() instead

It actually works this time
2018-04-09 00:59:50 +03:00
AnturK 5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
kevinz000 f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Ian Turk fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
Qustinnus 4911991f70 [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#36344)
cl Floyd / Qustinnus
del: Removes short-term effects of mood
add; Adds long-term effects of mood by implementing sanity which goes up with good mood, down with bad mood, but takes time to change. Your sanity can be seen as your average mood in the recent past. All effects of moods are now covered by this system
add: Beauty component, currently only attached to cleanables, but you could attach it to any atom/movable and make them pretty/ugly, affecting mood of anyone in the room.
refactor: Removes the original way of adding mood events, uses signals properly instead.
fix: Cleanables "giving" area's free beauty during initialization
fix: Fixes some events not clearing properly
/cl

Fixes #36444

From now on mood no longer affects you directly, instead it decides whether your sanity goes up or down, when your sanity gets too low you will get the effects of what mood did before.

This means getting hit with bad moods due to being attacked while not mean you are doomed anymore, and you get a large timeframe to get away and just fix your mood later.

I also added the beauty component, you could add this to any object and it would either make a room prettier or uglier, comparable to DF or Rimworld. You could add traits to make certain people ugly, for example.
2018-03-18 19:48:50 +13:00
Qustinnus 5140cff38c [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments] (#35475)
Floyd / Qustinnus (Sprites by Ausops, Some moodlets by Ike709)

add: Adds mood, which can be found by clicking on the face icon on your screen.
add: Adds various moodlets which affect your mood. Try eating your favourite food, playing an arcade game, reading a book, or petting a doggo to increase your moo. Also be sure to take care of your hunger on a regular basis, like always.
add: Adds config option to disable/enable mood.
add: Indoor area's now have a beauty var defined by the amount of cleanables in them, (We can later expand this to something like rimworld, where structures could make rooms more beautiful). These also affect mood. (Janitor now has gameplay purpose besides slipping and removing useless decals)
remove: Removes hunger slowdown, replacing it with slowdown by being depressed
imageadd: Icons for mood states and depression states


What this PR is

This PR adds a system that allows player to gain and lose moodlets based on events occuring to, and around them. These events then give the player a mood value based on what it is. For example a hug could give you +1 mood, while being stabbed in the eye with a screwdriver can give -5 mood. All these moodlets together determine the mood of your character which currently affects the following things:

    Movement speed - If you are very sad you move slower. Replacing movement slow from hunger. (hunger now instead affects mood)
    Screen blur - If you are sad you gain an overlay that slightly blurs the screen, increasing in severity as you get sadder.
    Interaction / do after speed - If you are sad or happy your interaction speed with things such as handcuffs is changed. with a 25% longer time if you are sad, or 10% shorter time if you are extremely happy.
    Hunger rate - You gain hunger slower if you are very happy.
2018-03-08 14:15:57 +13:00
vuonojenmustaturska 5460c077ef Advanced roasting sticks, for cooking sausages (#36071)
* stick

* a commit

* almost forgot something

* seems to compile
2018-03-04 22:41:16 +01:00
Dax Dupont fc3ad5dc66 SM can explode on space tiles again (#35275)
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
2018-02-08 22:12:56 +13:00
ACCount 100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
Iamgoofball 9faa968010 [s] Fixes clogged vents delamming the supermatter (#35300)
wow forgot to commit thiss to the PR lmao
2018-02-04 03:04:23 -06:00
Dax Dupont 0314c5c0f8 Unfucks supermatter extraction (#34785)
* Unfucks supermatter extraction

* Redoes it

* moves it to src so it doesn't rely on a user

* neat

* Makes it random because it was requested even though it makes little sense to

* Dedupes some code and removes \the

* Removes \the, add message on break.
2018-01-25 09:00:26 -05:00
ShizCalev f0ffdb94ae Fixes poly SM spam 2018-01-23 15:55:44 -05:00
ShizCalev 8ebeb02455 Fixes mobs getting dusted by SM & Tesloose in jaunt 2018-01-01 17:43:15 -05:00
Emmett Gaines 25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Emmett Gaines 642fa696eb sm soundtweak (#33154) 2017-11-29 21:58:56 -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
vuonojenmustaturska 39375d5cc2 Replaces a bunch of mob loops with hopefully better ones (#32786)
* Free codebase churn

* fixes dviewmob

* a commit

* Partial revert "Free codebase churn"

This reverts commit 9dd41b3860c331637bbc85e694dd32dc59768ad5.

* better fix to dviewmob

* renames living_mob_list to alive_mob_list, adds mob_living_list and carbon_list

* make some use out of the shiny carbon list

* make some use out of the shiny new living list

* more things, also make the mobs subsystem (Life) use living list

* bonus

* domo arigato mr. roboto

* compile fixes, also made the drone code less dumb

* better?

* make admin message prettier

* honk

* fixes blobs

* rev fixes

* one small thing
2017-11-16 23:08:40 +01:00
Jalleo 2f9537c7a9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 14:19:04 -05:00
as334 43edaedc29 Assmos part 1, #2 (#30791)
* First part of Assmos

* Adds tritium synthesis and basic in-body effects.

* Begins adding the higher tier gases. Removes Freon(not completely yet) adds new gases to scrubers. Fixes some dumb bugs.

* Whoops

* Adds effects and synthesis reactions for pluoxium and stimulum

* Kills Freon.

* Adds sprites

* Removes the magic numbers

* Hyper-Nobelium formation

* Removes Freon from maps.

* Initial Dunc Review changes

* Should ACTUALLY fix the maps this time.

* Dunc Final Review

* Debugging part 1

* Fixes brown gas synthesis

* Auto stash before merge of "assmos-pathconflicts" and "origin/master"

* fix compile errors

* Moves defines. Fixes stimulum coefficents.

* Reworks how Stim and brown gas work, adds tritium to tile fires, fixes a lot of general reaction bugs.

* fixes typo

* Hopefully fixes UI

* compiles tgui

* Tritium balance.
2017-10-26 22:11:56 -06:00
Emmett Gaines 9598b8ee92 Adds ambience to the SM and portable generators (#31945)
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
2017-10-25 23:36:08 -05:00
Emmett Gaines 9d17e9c102 Fixes camera mobs becoming contaminated and other tweaks (#31731) 2017-10-14 19:39:51 -03:00
Emmett Gaines 456cd10d94 Radiation rework and subsystem (#30909)
* radiation rework and subsystem

* moves a few things to initialize and adds radiation insulation

* adds a radiation contamination mechanic and makes requested changes

I'm terrified by the possibilities from this

* radiated objects give off light

and hopefuly contamination is balanced

* fixes runtimes and an mc crash kek

removed the lighting part of contaminated objects
attempted some more balancing

* Collectors output power in process() gradualy

And some more balancing tweaks

* Excludes a bunch of things from becoming radioactive

* Ready for testmerge balancing

* Inverse square law was swapped

* testmerge balancing

fixes the geiger counter
buffs collector power gen
nerfs sm radiation
slightly buffs rad insulation
nerfs rad damage (and its burn)
raised the minimum radiation

* disabling the radiation subsystem won't build up rad wave datums forever

* rewrites how mobs handle radiation

upgrades geiger counter functionality
and more balance tweaks

* cleans up stuff and removes debug message

* Slight contamination buff

* Major rad wave performance boost

Also improves rad insulation
Buffs contamination, again

* Fixes insulation runtime

More balance and performance tweaks

* fixes rad collectors not receiving power

* The final balance commit

Fixes a major bug causing radiation to underperform
More geiger counter changes that will be changed more to add sounds

* Monkey business

* Geiger counter sounds

* cleanup and move components to their own initialize

* Some code cleanup

And forgotten changes

* Cleans up some trailing returns

* Mapping changes
2017-10-13 10:22:00 -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
ShizCalev ef5cf0e5a5 Fixes aliums being able to attack the SM crystal 2017-10-01 05:04:13 -05:00
ShizCalev 4f4008920f Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:42:40 -05:00
Jordan Brown b208a51975 Fixes supermatter sliver objective being given if there is no supermatter engine (#30032)
* Adds /engine variants of supermatter_shard

* Makes maps use /engine supermatter_shard variants

* Adds a framework for ensuring an objective_item exists before giving it as a target

* Fixes supermatter sliver objective being given with no supermatter engine on the map

* Works around BYOND stupidity
2017-08-24 11:39:35 +12:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
shizcalev 73561bc24a Revert: Minor supermatter code refactor(#28848)
Moves repeated code into procs, as well as adding processing handicaps/damage hardcaps to things that really need them. (reverted from commit 59ce8fa832)
2017-08-07 16:02:03 -04:00
kevinz000 59ce8fa832 Minor supermatter code refactor(#28848)
Moves repeated code into procs, as well as adding processing handicaps/damage hardcaps to things that really need them.
2017-08-06 20:17:37 +12:00
shizcalev 1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
shizcalev 719612ba3b ALLOW ME TO BREAK THE ICE 2017-07-26 20:44:42 -04:00
oranges e04fd83b9d Rename Bumped to CollidedWith
In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
2017-07-15 00:25:22 +00:00
ShizCalev 59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Ashe Higgs 8776c15703 Supermatter code cleanup (#29103)
* Simple animals are now properly disintegrated

* Now it's a cleanup PR!

* sanity check me out

* praise the webeditor!
2017-07-09 20:59:48 -04:00
ShizCalev 40aa9ce8ce Switches SM squawk to report integrity (#29084) 2017-07-09 11:14:05 -04:00
Jordan Brown 4553bc8109 Merge pull request #29090 from ShizCalev/sm-alarm-sounds
Adds alarm sounds to SM
2017-07-07 13:18:04 -04:00
Jordan Brown e74ba17b96 Merge pull request #29080 from ShizCalev/sm-attack-tweaks
Removed silicon SM interact message
2017-07-07 10:23:04 -04:00
shizcalev 44066d2258 Switch instead 2017-07-06 14:09:00 -04:00
shizcalev 9eafe2f28e changed playsound to src 2017-07-06 13:56:10 -04:00
shizcalev 1166b6ccc4 Adds alarm sounds to SM 2017-07-06 13:39:00 -04:00
shizcalev 12d70973f0 Correction 2017-07-06 12:12:04 -04:00
shizcalev 97830806bb Changes SM integrity rounding 2017-07-06 03:54:18 -04:00