Commit Graph

148 Commits

Author SHA1 Message Date
Redmoogle 00f36b904e Adds support for 3 gasses to the SM (#45676)
* Adds Tritium, Pluoxium, and BZ reactions to SM

* fixes Tritium Heat Penalty

* Makes tritium a little less deadly and more unique

* Makes the BZ Radball probability less frequent

* Makes Pluox lesser n2o

* Makes BZ less viable/op

* Makes pluoxium effective only above 15%

* Fix bad code

* Pluoxium also reduces radiation severely

* removes fuckup

* fixes gasmix ratio

* fixes some of my bad code
2019-08-10 02:15:04 -07:00
nemvar e587b970da Adds parent calls to almost all tool_acts (#45582)
* Adds parent calls to almost all tool_acts

* actually compiles
2019-08-03 22:25:57 -07:00
Rob Bailey 687d5103e8 Better Supermatter Sounds (#45462)
About The Pull Request

Replaces supermatter sounds with a new sound system for it.
Works based on having a constant drone that randomly plays accent noises over it.
https://www.youtube.com/watch?v=k5kKc5mpl-A&feature=youtu.be

I've barely tested this
Why It's Good For The Game

the old sounds are terrible
Changelog

cl
soundadd: New supermatter sound system
/cl
2019-08-01 21:03:48 +12:00
kingofkosmos ec5c82029a * "Is already...", "Can not...", "Not when..." etc. 2019-06-27 06:15:43 +03: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
vuonojenmustaturska 2d74a86353 [READY] Cleans up saycode by removing random hook stubs and using a signal where relevant (#44320)
About The Pull Request

This PR removes speech message and span hooks from dna, mutations, pierrot throat disease, species, tongues, masks, hats, held items, brain traumas and a carbon proc overload handling tonguelessness.

Tonguelessness is now handled by tongue removal registering for the speech signal and the hook being deregistered by having a tongue put in.

Also cleans up some /atom/movable/proc/get_spans() overloads that called the empty parent or overloaded the parent to do the exact same thing as the parent proc did.

Also cleans up calls to radio.talk_into() where the caller would often, as a result of copypasta, provide the proc with fresh copies of the proc's default values for proc args, and makes say_quote() better by giving it a default spans value so that none of the callers have to provide the same default one.
Why It's Good For The Game
Changelog

cl Naksu
code: Cleaned up saycode
/cl

* start with this

* oh man this looks so good

* hats are dead

* /obj/item/proc/speechModification is dead

* brain traumas and get_held_item_speechspans() are dead

* these should be static

* unfortunately we still need this

* /mob/living/carbon/treat_message(message) is kill

* clean up get_spans()

* dunk get_spans, modifies_speech for brain traumas, some superfluous static stuff

* move stuff around

* return values
2019-06-06 18:35:06 +12:00
Eaglendia 9b8404d489 Smoking is now rad. [Ready] (#44066)
* Automatic changelog generation for PR #44023 [ci skip]

* You can light a cigarette on the supermatter shard.

* Update tips.txt

* Update supermatter.dm

* Update supermatter.dm

* Clumsy condition

* Update supermatter.dm

Cleaning up that message

* Update supermatter.dm

removing big dummy proc calls
2019-06-01 23:54:45 +02:00
AnturK 11441e5dae Makes supermatter melt walls if it finds itself in one (#44068)
* Makes supermatter keep producing gases in walls.

* While i'm at it, fixes sm radio runtime

* Oh right this was split.

* Alright switching it to melting through.
2019-05-27 22:33:55 +12:00
kevinz000 7370de6961 Fixes projectiles not hitting people resting, a bit of refactoring of how projectile target collision is done (#42241)
* Fixes projectiles not hitting mobs, some refactoring too

* some stuff for projectile can hit target to work with not being ontop of an object

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* Yeah let's just refactor bullet_act while we're at it.

* CanPass returns true to projectiles regardless of hit

* snakecase?
2019-01-19 11:17:42 +13:00
Denton 87ae58ef08 Merge remote-tracking branch 'tgstation/master' into dusted
at least it's not a map merge conflict
2019-01-14 21:29:05 +01:00
Dax Dupont b1c8a8c982 Fixes supermatter extraction again (#42326)
* WHAT THE FUCK YOU FUCKING MORON

* includes parts of dent

* let's talk about floyd with his dumb ass prs, who the fuck asks for or wanted hygiene except fart fetish lovers, seriously musk/body odor is one of the weirdest and shit fetishes there are why are we enabling floyd's fetishes my god man the maintainers are a disappointment jesus christ.
2019-01-14 09:48:26 -05:00
Denton ffc1c52e73 Improves various supermatter messages 2019-01-11 13:52:40 +01:00
Barhandar c49064bf62 Makes magboots effective in preventing gravitational movement effects, fixes magboots not working for singularity pull, eases the chainstun effect of overcharged supermatter (#41583)
* I'm through accepting limits 'cuz someone says they're so

* Some things I cannot change but till I try, I'll never know!

* Too long I've been afraid of losing love I guess I've lost

* Well, if that's love it comes at much too high a cost!

* I'd sooner buy

* DEFYING GRAVITY

* Kiss me goodbye, I'm defying gravity

* I think I'll try

* DEFYING GRAVITY

* And you won't bring me down

* Unlimited
2018-11-22 18:38:49 -05:00
ShizCalev ceae7b3d5f Restores supermatter shard stun (#41417) 2018-11-13 01:34:51 -05:00
Seagleb 88d3942339 Fixes Supermatter Shard being hidden behind objects (#41107)
* Fixes Supermatter Shard hiding behind objects.

* Fixes Supermatter Shard hiding behind objects.

* Adds define for Supermatter Shard Layer

* added define for Shard layer

* Used default above mob layer define instead
2018-10-25 17:14:36 -04:00
octareenroon91 646d23e05f Add fingeprintslast to Consume(/obj) (#40059)
Log ckey when an object smacks into a supermatter crystal.
2018-09-04 00:41:57 +03:00
tralezab 6a1b807a9c telekinesis now works on the singularity, tesla, and tear in the fabric singularity. tweaks interaction to using tk on supermatter. (#39694)
honestly? i'm a little hurt nobody else did this when @XDTM made the great suggestion. There are a few problems with the tear in the fabric interaction, hoping a maintainer can help out
2018-08-30 20:01:28 +12:00
ShizCalev 4455164250 Fixes SM-megafauna server crash exploit (#39124) 2018-07-14 14:12:33 +03:00
ninjanomnom 059da44453 Converts collide back to bump and fixes double bumping in another way
This is in preparation for step_x support as the default behavior for these procs is necessary for proper functionality.

turf/Enter and atom/movable/Move default code got rewritten to replicate default byond functionality with minor changes.
2018-07-07 11:22:29 -04:00
81Denton ae2ad89295 Cleans up supermatter related varedits (#38540)
* Cleans up supermatter related varedits

* reee

* fakecrystal
2018-06-17 12:32:42 -04:00
Tad Hardesty 2f8f166d88 Merge pull request #38287 from ninjanomnom/signal-define
Use a define to speed up sending signals to datums with no signals
2018-06-14 22:17:01 -07:00
ShizCalev e5886b49d7 Cleans up some timer messages (#38446) 2018-06-13 17:12:18 -07:00
ninjanomnom d483ff3ef0 Regexes
`([^_\.])SendSignal\((.+?)\)` -> `\1SEND_SIGNAL(src, \2)`
`([\.\w]+?)\.SendSignal\((.+?)\)` -> `SEND_SIGNAL(\1, \2)`
2018-06-13 19:19:23 -04:00
ShizCalev 3abd2b6d27 Cleans up logging 2018-06-09 15:51:58 -04: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
vuonojenmustaturska 4f210f49f5 Disallow effects from being scanned by the chameleon projector (#38017)
* henk

* iseffect
2018-05-25 14:36:56 +02:00
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