Commit Graph

30 Commits

Author SHA1 Message Date
Jordan Brown e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
ShizCalev cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04: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
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
Ashe Higgs 7c38e7eac3 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-26 09:50:16 +13:00
Jordan Brown d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
AnturK c3c9f4c668 Highlander antag datum (#35519)
* Highlander antag datum

* Forgot debug line

* Also this
2018-02-11 16:32:06 -05:00
PKPenguin321 fa08aaf7fe adds extendohands (#34599)
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
2018-01-29 18:36:35 +02:00
vuonojenmustaturska 2871b70733 /obj/item var cleanup (#34909)
* draft 1

* Update energy.dm

* Update twohanded.dm

* Update weaponry.dm

* Update ninja_stars.dm

* Update cult_items.dm
2018-01-25 22:44:32 -05:00
XDTM 5a08a3aad0 Extends the disability refactor to include more traits, removing some snowflake code (#34664)
This way you can add/remove traits without fear of other sources overriding them. Now you can add TRAIT_STUNIMMUNE to somebody without what if hulk

Notable changes:

    Fakedeath now updates instantly, instead of waiting for the next life tick.
    Fakedeath now sets time of death when acquired.
    Removed extremely snowflake code in reagents that checked if you had morphine to remove slow immunity and so on.
    Hulk no longer overrides status_flag changes, in case there are any.
2018-01-25 09:12:44 +13:00
Jordan Brown dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
kevinz000 5182128d2a refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249) 2017-12-04 10:33:01 +13:00
kevinz000 caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
swindly b8dae82098 adds suicide_act()s 2017-11-10 18:23:01 -05:00
MoreRobustThanYou 0f005901c6 You can now use banhammers as a weapon (#32270)
* You can now use banhammers as a weapon

* Update weaponry.dm
2017-11-02 03:25:40 -06:00
Jordan Brown 8281df511a Removes force from slappers 2017-10-27 10:22:08 -04:00
Jordan Brown c54864d2ad --no-edit 2017-10-25 23:38:00 -05:00
Firecage afd8bb7be5 Code Consistency: luminosity --> light_range (#31355)
* Code Consistency: luminosity --> light_range

* Finally-remembers-to-update-PR is best lizard.

* Update singularity.dm
2017-10-22 01:06:07 -04:00
ShizCalev 362d304714 Fixes slapper inhand (#31793) 2017-10-17 12:35:00 -06:00
oranges cf3f3dc4ff Merge pull request #31699 from jughu/Misc
Increasew the size of the katana from normal to huge
2017-10-17 21:49:09 +13:00
jughu bac0576345 Update weaponry.dm 2017-10-14 11:34:32 +02:00
deathride58 33d59567a6 Adds Slappers (#31406)
* ADDS SLAPPERS

* fixes everything, just need sprites

* nerfs criticism
2017-10-10 20:53:32 -04:00
Tad Hardesty 5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Armhulen bcbc16691b chainsaws rebalance, but working this time :) (#30399)
* buff chainsaws 2: electric boogaloo

sned help

* Revert "helps chainsaws out"

This reverts commit 2954df89e9393bb29894a29af83abe3d69f27c78.

* helps chainsaws out

i'm sorry we hurt you chainsaws

* i'm not stupid i'm misguided!

but i actually totally agree with this so !go kor!

* AH, BINGO.
2017-09-09 01:00:34 +10:00
ShizCalev 129a7b9a0b Fixes brains counting towards highlander killstreaks (#30396)
* Fixes brains counting towards highlander points

* !QDELETED check, switched to only look for carbons
2017-09-07 12:14:16 +02:00
oranges 11cf723a95 Traitor, a traitor is a traitor.
Means that one of the crew members works for a criminal Syndicate and
must something to seize / kill someone / someone to protect and dump
from that Durkee on the shuttle. At English stations the word everyday,
for Russians for the mention of the word "traitor" is not in the chat
(IC) admins are stroking the head with a bangammer. So this word and
memetic.
2017-08-25 08:31:07 +00: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