Commit Graph

1995 Commits

Author SHA1 Message Date
vuonojenmustaturska 3eb30b16f3 Replaces HEALS_EARS_2 with a component, adds a wearertargeting parent component for future use (#37530)
code: HEALS_EARS_2 is removed in favor of the earhealing component

code: wearertargeting component is available to subtype for components that want to target the wearer of an item rather than the item itself
2018-04-30 10:32:59 +12:00
ShizCalev 386f1ad622 Fixes invisible turtleneck alt state 2018-04-29 10:06:44 -05:00
oranges 4f9006681e Revert "You can no longer equip pet collars on humans"
This reverts commit 7935f2b407.
2018-04-28 23:19:58 +00:00
oranges e2f617e962 Merge branch 'pets' into upstreamunsafemaster 2018-04-28 23:18:59 +00:00
oranges d30da792ce Merge remote-tracking branch 'upstream/master' into pets 2018-04-28 22:58:09 +00:00
Jordan Brown e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04: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
ShizCalev cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04: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
KorPhaeron ad809a0e5b Makes engine goggle numbers more visible (#37324) 2018-04-22 20:21:14 -04:00
vuonojenmustaturska e9529e4cfd Gives mining bots back their mesons (#37196)
* Gives mining bots back their mesons

* qdel
2018-04-16 05:35:35 -04:00
Tlaltecuhtli 2570384371 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 16:12:36 +03:00
kevinz000 ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Emmett Gaines 49d1e9ee66 Shuttles have additional baseturfs, and other minor baseturf changes (#36388)
cl ninjanomnom
fix: Shuttles have proper baseturfs now.
fix: Mineral walls properly use their baseturfs when destroyed/drilled.
add: A new engineering goggle mode allows you to see the shuttle area you're standing in.
admin: Buildmode works a bit better with baseturfs now and can properly only remove the top layer of turfs when editing. Note that as a result the order you place turfs is important and a wall placed on space means when the wall is removed there will be space underneath.
/cl

This adds an area hook for turfs getting the PlaceOnTop proc called so shuttle areas are able to intercept it and add a special turf used for determining where the bottom of the shuttle is. I'm not too certain on this being the best way to handle it but the alternatives restrict the kind of turfs that are allowed to be on shuttles which I didn't want to do as it was part of the whole intent of the baseturf change to allow any turf type on shuttles.

The alternative to the area hook would require a tool which attaches turfs to a shuttle which is why there's a shuttle area viewing tool in this pr. I considered doing it this way first but decided it was too clunky.

In addition to other changes:

Tiled/Reinforced floors have proper baseturfs now.

A large amount of the remaining ChangeTurf calls were swapped over to various baseturf helpers so, for example, mining doesn't create a lavaland turf if somehow the mineral wall is on plating.

Escape pods, the aux base, and syndicate drop pod have been converted over to shuttle templates as well.

The error when the timid var is set incorrectly has been changed to a stack_trace.

The change turf file has been made all lowercase as per standard.
2018-04-05 11:13:20 +12:00
Davidj361 06e314800b [s] Fixed dragging shackled prison shoes off (#36630)
* Fixed dragging shackled prison shoes off

* Should be returning FALSE, otherwise returns nil

* Did review change
2018-04-01 15:29:59 +03:00
kevinz000 d60cc7afb0 runtime 2018-03-30 12:51:40 -05:00
iksyp 46b11fbba6 Night vision goggles no longer cancel out thermal eyes (#36609)
cl
fix: night vision goggles no longer overwrite thermal eyes. nvg eyes no longer overwrite thermal goggles.
/cl

fixes #35921
2018-03-28 10:12:02 +13:00
kevinz000 f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
zxaber 9d5f0c5506 Engie goggles in Meson mode now respect light levels (#36504)
* Engie goggles in Meson mode now respect light levels

Meson glasses show the surrounding terrain, but darken areas beyond line of sight and that are not lit. Engineer goggles set to Meson mode currently show all terrain at max brightness. As a result, it can be hard to even know an area is unlit until objects (or mobs) suddenly start popping in one tile away.

This change makes the Engineer goggles respect light levels like Meson glasses do.

An image for visual aid;
https://i.imgur.com/KdYmkZb.png
Left shows the current Engineer goggles. Right shows the current Meson glasses, and how the Engineer goggles will look with this change.

* Update engine_goggles.dm
2018-03-19 22:11:27 -04:00
vuonojenmustaturska 0714b6a4da inquisition ert tweak (#36511) 2018-03-19 20:25:55 -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
Cruix 7639492389 Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 02:40:53 -04:00
kevinz000 fe5fdec776 [READY] Refactors wet floors to a component (#36130)
* Wet Floor components

* No more turf wet slide.
2018-03-17 11:26:09 +13:00
XDTM e34930714b Refactors some trauma code, fixes some trauma heals not working (#36093)
* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments
2018-03-15 07:57:46 +01:00
TheDreamweaver 68cafe6fd1 Adds Wheely-Heels and Kindle Kicks [Merge Ready] (#36309)
* Adds Wheely-Heels, a pair of shoes with inbuilt roller-wheels. Can be rarely received as reward from arcade machines.

* Fixed issues with Wheely-heels, added Kindle Kicks

* Cleaned up code

* Fixed Destroy()

* Thoust shall return the parent, like Oedipus

* Final Fix XIV
2018-03-13 02:57:48 -06:00
kevinz000 6c11cb8c8b Fixes blindfolds blinding when not over your eyes (#36316)
* fixes blindfolds

* lets use ref instead then
2018-03-12 23:59:16 -04:00
vuonojenmustaturska 6aabcac079 Create ERT refactor (#36321)
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
2018-03-12 23:48:09 +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
Dax Dupont ba222916be Fixes tinfoil hats and lengthens the time for someone else to put it on (#36019)
* Fixes tinfoil hats and lenghtens the time for someone else to put it on

* Adds some flavor to that text
2018-03-04 17:05:39 -05:00
XDTM dab977d6fd Blindfolds properly apply blindness (#36101)
* blindfolds properly apply blindness

* covering your eyes now applies blindness
2018-03-03 20:19:51 -06:00
cebutris 2f5851aab3 White crayons no longer make gloves look latex (#36062)
* makes white crayons make white gloves, not latex

* mime subtype gloves

* Why didn't cobby think of this?

* makes mime crayons give latex gloves
2018-03-03 17:02:39 +11:00
Ashe Higgs d1edd8f505 Alternative PR to brass apples: Adds bronze sheets (#35874)
* Adds bronze sheets

* nope!
2018-03-02 13:35:58 +13:00
Dax Dupont 6dcfe7fc45 Medals now show the commendation text in the description. (#36020)
* Medals now show the commendation text in the description

* the user is now real
2018-02-28 13:11:53 -06: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
MMMiracles 3108118b36 Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 19:10:55 -05:00
XDTM 2ac902ab3c Refactors anti-magic into a component (#35639)
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
2018-02-26 09:45:12 +13:00
Leo 71e8221a77 Merge pull request #35830 from vuonojenmustaturska/clientsignal
Reverts intercept_user_move change for flightsuits
2018-02-21 10:23:37 -03:00
ACCount12 1621f37a8c Ports some operation to tool_act 2018-02-21 01:37:54 +03:00
vuonojenmustaturska 180ddba385 revert 2018-02-19 22:08:33 +02:00
Jack Edge 8c865f6b0b Italian mustache respects capital letters more
Fixes #35627.

Uses a new system of "word_replacement" for replacing words, trying for
capitalized, upper case and just the regular key. Supports multiple
possible "replacements" for a given key.
2018-02-16 21:58:53 +00:00
vuonojenmustaturska ee370ada3f Removes on_mob_turn, on_mob_move and intercept_user_move, speeding up movement (#35679)
* honk

* qdel memes
2018-02-16 01:39:59 -05:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
oranges 82af086fd8 Merge pull request #35542 from ShizCalev/free-spam-removal
Cleans up some duplicate canusetopic warnings
2018-02-16 15:34:37 +13: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 3cb6ab32d2 Cleans up some duplicate canusetopic warnings 2018-02-11 09:56:43 -05: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