Commit Graph

1741 Commits

Author SHA1 Message Date
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Shadowlight213
7dc030fd3d lowers damage cap on breaking apcs (#36520) 2018-03-19 22:06:20 -04: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
RandomMarine
093cfdfe45 Tesla coils and grounding rods actually shock buckled mobs. (#36437)
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
2018-03-17 15:48:56 +02:00
Dax Dupont
92cac3fd09 Fixes the coil 2018-03-13 22:38:15 +01:00
ShizCalev
40e2cc568d Cleans up vars 2018-03-10 12:54:22 -05:00
astralloop
4b08977536 Constructed turbines now properly connect_to_network() (#36222) 2018-03-10 02:30:31 -06:00
Poojawa
1293873b59 Adjust Tesla RP maths (#36229)
* Adjust Tesla RP maths

As it turns out, this is basically a multiplier, not a number cap.

* clarifies maths and removes some excess code
2018-03-10 02:24:59 -06:00
Robustin
41590b6867 The ARM is now harder to obtain (#36051)
* Added ARM difficulty

* Working edition Pt1

* Actually working Pt2

* Appropriate null check?

* Update narsie.dm
2018-03-09 09:17:14 +01: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
Poojawa
2e03d27a01 Tesla researchers are fixed now I swears (#36136)
* Tesla Coil path fix

Better to just force a path change to something valid than to 50/50 if it doesn't have a path, because it has a path already. Byond, you so silly.

* reeee construction memes
2018-03-05 16:23:03 +02: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
vuonojenmustaturska
440e888c1f Clean up all sorts of crap, mostly defines (#36105)
* cleanbot

* rejuv

* more crap

* more crap

* still compiles

* clean

* is_crap
2018-03-05 02:07:27 +11:00
ShizCalev
602de792fa Fixes backup light rounding - #36060 2018-03-02 16:43:19 -05:00
BordListian
bd4b09fff2 Makes machines constructable either anchored or unanchored (#35968)
* - Makes machines constructable either anchored or unanchored if the board allows it

* - Tesla Coils connect to the network if anchored
2018-03-02 13:45:00 +13:00
Poojawa
93fc444ca7 Fix Tesla Coils being simultaneously screwdriver'd (#36064) 2018-03-01 15:58:30 -05:00
Poojawa
0e99906e6a Tesla Corona Analyzers (#35965)
* Tesla Corona Analyzers

Generate points to make up for no bomb production on maps like Pubby

* Silly me, not Aurora, but Corona

* Adds sprites to the new mode

* new sprites! credit to... me!

* Further sprite tweaks.
2018-02-27 15:21:46 +02:00
oranges
1373151804 Merge pull request #35854 from ACCount12/more_tool_act
Ports more operations to "tool_act"
2018-02-27 09:29:28 +13:00
deathride58
56896dfc8e Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)
* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour
2018-02-24 00:46:43 -05:00
BordListian
65d8972b8c Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)
* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells
2018-02-23 21:35:11 +02:00
kevinz000
8ebc63d2f2 Randomized Station Time + Night Shifts 2018-02-20 21:59:44 -08:00
ACCount12
b948151f60 Removes unnecessary type definitions 2018-02-21 01:41:42 +03:00
ACCount12
1621f37a8c Ports some operation to tool_act 2018-02-21 01:37:54 +03:00
vuonojenmustaturska
9e3ee33079 Merge pull request #35703 from DaedalusGame/ok-sure-why-not
Fixes powercell injecting attaching the wrong value to rigged
2018-02-16 13:09:01 +02:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
BordListian
27d63d13a9 - Fixes powercells attaching the reagent datum for plasma to their rigged var what the hell 2018-02-15 20:34:40 +01:00
Dax Dupont
0b718fa053 Cell chargers are now buildable and (upgradable!) machines. (#35517)
* Cell chargers are now buildable machines

* done
2018-02-12 12:15:18 -05:00
ACCount
c6e607dc17 Refactors use_sound and changes the way tools play sounds (#35521)
* Adds list support to usesound, ports drills to usesound

* Adds more tool sounds, changes usesound usage to play_tool_sound

* fix
2018-02-12 17:16:47 +02:00
ShizCalev
bfde5ac057 [s] Fixes altclick exploits (#35456)
* Fixes altclick exploits

* Removed free spam, fixes monkey altclicks

* replaced named args with proper defines

* More cleanup and fixes

* Better yet

* Another exploit fix

* pet carrier fix
2018-02-11 16:06:12 +13:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
Jordan Brown
9eaa717778 Cell blueprints now use the /empty variants (#35463)
* Cell blueprints now use the /empty variants

* Add empty stock cell
2018-02-09 13:50:19 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05: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
BordListian
c582b897da Forces gases to obey certain laws of nature (#35277)
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.

* - Redundant parenthesis
- I'm going back to sleep

* - Sends fire and fusion to jail

* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors

* - Reverted the tritium burn changes because apparently I'm dumb

* - FUCK

* - Fixes division by zero when fusion has no impurities

* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs

* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-06 15:16:26 -06: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
Dax Dupont
317574712f Fixes the AI from being able to magically turn on broken APCs (#35284)
* Fixes the AI from being able to magically turn on broken APCs

* actually shorted allows you to operate the interface still

* bleh

* kiki ya ya
2018-02-06 00:40:01 -05:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +02:00
Dax Dupont
f3d99a0c34 Fixes power cell name and makes borgs use a standard high capacity cell. (#35265)
* Fixes name for upgraded power cell

* Harmonizes battery for cyborgs

* Remove duplicate battery code
2018-02-05 02:14:09 -02: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
arsserpentarium
0b757c82ae battery rig fix (#35254)
* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification
2018-02-04 01:30:20 -06:00
ShizCalev
3c345d99de Fixes lightfixture placement issue 2018-01-31 09:04:51 -06:00
Robustin
418a8c0112 Cult Update (#33810)
* Cult overhaul
2018-01-30 21:59:03 +02:00
uraniummeltdown
24204d4e28 replaced solar panel sprites with better ones 2018-01-29 11:02:29 -06:00
vuonojenmustaturska
102d6a1f16 Revert "Power Cell explosions are now log" 2018-01-27 17:00:51 -06:00
Jordan Brown
a6135a8dcd Merge pull request #34852 from Iamgoofball/patch-376
Power Cell explosions are now log
2018-01-25 22:54:47 -05: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
Jordan Brown
d6a9dd77a7 Merge pull request #34841 from ShizCalev/derelict-fix
Fixes derelict area issues
2018-01-24 19:09:05 -05:00
Jordan Brown
d7c5fca020 Merge pull request #34838 from ShizCalev/sm-godmode-fix
Fixes poly's ghost SM spam
2018-01-24 19:07:49 -05:00
Iamgoofball
b99efd8e65 Power Cell explosions are now log
a 20k cell will be about the old max-cap
2018-01-23 20:19:31 -08:00