Commit Graph

1763 Commits

Author SHA1 Message Date
AnturK
346819e30c Readds missing nuked narsie cinematic. (#37584) 2018-05-01 12:04:55 -04:00
Jalleo
5d2db204bc [s] Small tweaks and fixes a edgecase with machine construction (#37494)
* Puts back required time for the emitter and field_generator and also removes a certain issue that certain people were causing

* Couple of things I missed

* I noticed the error with regards to atom and changed to obj like I was trying to originally. Also its fine to build on tables that wasnt the issue with this specific aspect.

* Edge windows. We need those.

* optimised the checks to be behind a if check for when you are actually needing to make something for the floor...

* Corrects a input proc by request

* Working is not my strong suit.
2018-04-30 13:01:43 +03:00
oranges
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
81Denton
f41d77063b fixes obj descs and adds new ones (#37483) 2018-04-27 21:20:55 +03:00
Dax Dupont
52a7ebcbff Refactors and fixes RPEDs (#37380)
* Refactors and fixes RPEDs

* Fixes storage related memes

* beams should probably always play
2018-04-27 21:12:41 +03:00
Emmett Gaines
ffa5256ee3 set waitfor in final countdown (#37453) 2018-04-27 21:01:52 +03:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Dax Dupont
4ca70e7f4e Improves logging/messaging for singularities. (#37411) 2018-04-24 11:18:57 -04:00
Dax Dupont
0de35f88bc Makes radiation collectors buildable (#37363)
* Makes radiation collectors buildable

* capitalism at it's finest

* a
2018-04-24 08:13:13 -04: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
pigeons
6135ec864f Refactors bitflag macro values into bitshifts (#37234)
* Refactors bitflag values into bitshifts

* minor formatting edits

* Unbitshifts a macro set that skipped 3 for whatever reason
2018-04-19 18:36:35 -04:00
vuonojenmustaturska
0e2ee4f5b6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218)
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
2018-04-18 16:32:35 +02:00
Tad Hardesty
4a8c989d74 Fix grammar in lightbulb shatter message (#37207) 2018-04-15 23:43:25 -04:00
AnturK
66d9a4a0cf Removes /related area variable. (#37173)
* Removes /related area variable.

* area_contents begone

* doorstuff
2018-04-14 12:45:00 +03: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
Tad Hardesty
80570931d1 Fix various macro consistency problems (#37092) 2018-04-11 13:20:57 +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
Jordan Brown
6fb849eeb3 Merge pull request #36840 from 81Denton/singulo-power
Fixes singularity power output
2018-04-01 01:18:48 -04:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Denton
825a47feba increases singulo rad multiplier 2018-03-30 22:15:55 +02:00
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