Commit Graph

942 Commits

Author SHA1 Message Date
Dax Dupont
841a6aff93 Adds some more reagents to clogged vents 2018-04-29 18:57:10 +02:00
oranges
ecd0d8b538 Merge pull request #37476 from AnturK/thisalwaysbuggedme
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
Dax Dupont
2cb075a85d Makes clogged vents scale, and way less powerful. (#37385)
* Makes clogged vents scale, and way less powerful.

* tweaked numbers
2018-04-27 21:04:46 +03:00
AnturK
52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
KorPhaeron
6e056f7791 Paperwork Error Event (#37443)
* Paperwork Error Event

* Condense the proc

* Properly calls set_overflow_role
2018-04-27 01:57:16 -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
kachnov
88b1e1b8a0 Fixes Kudzu growing in space (#36701)
* initial commit

* adds a macro

* a small change

* Update spacevine.dm
2018-04-19 10:13:28 +02:00
Jordan Brown
7379c23a7e Reduces aurora caelus weight to that of meteors 2018-04-13 09:02:48 -05:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
ShizCalev
e71af8bc87 Fixes Gr3y.T1d3 delaming the SM (#36925)
Fixes #36841
2018-04-11 22:11:49 +12:00
Emmett Gaines
11ba45f708 Makes the pirate ship use a proper shuttle template (#37006) 2018-04-09 11:36:34 +02:00
KorPhaeron
dea0512059 Removes advanced darkness 2018-03-30 07:31:55 -05:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
ShizCalev
2211eb0bc1 Fixes brain damage json runtime 2018-03-15 00:05:17 -04:00
Ashe Higgs
4a6e0c6b00 Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#35987)
* Aurora caelus

* I saw that!

* fix?

* Weight increase for testmerge

* Update aurora_caelus.dm
2018-03-10 19:57:22 -06:00
Tad Hardesty
ec6f62fd07 Tidy Processor Overload event code (#36277) 2018-03-10 02:03:43 -06: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
Tad Hardesty
018a74e558 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 02:48:22 -05:00
Cruix
dedf5f5ed9 Disease antagonist (#35988)
* Virus antagonist initial commit

* Updated disease code

* Sentient virus improvements

* Renamed /mob/living/var/viruses to diseases, and /mob/living/var/resistances to disease_resistances

* Added sentient virus event

* Renamed VIRUS defines to DISEASE defines

* Fixed bugs in rewritten disease code

* Fixed advanced disease Copy()

* Finalized disease antagonist

* Made cooldown buttons stop processing if they are removed from an owner.
Made sentient disease active sneeze and cough not available if the host is unconscious.
Made sentient disease menu refresh when adaptations are ready or hosts are added or removed.
Made sentient disease following use movement signals instead of fastprocess.

* Added better icons to sentient disease abilities
2018-03-05 13:55:10 +01:00
oranges
6c1f496049 Merge pull request #35928 from Robustin/brokenhearts
Heart Attack Event Actually Works Now
2018-02-27 09:26:12 +13:00
XDTM
b49798c483 Converts several species traits into generic traits (#35743)
* Converts several species traits into generic traits

* 2hot
2018-02-26 10:47:58 +13:00
Robustin
ede606b814 Working Heart Attack event 2018-02-23 13:41:09 -05:00
81Denton
5e4c3c3e9f Changes event earliest_start to use time helpers (#35841)
* uses time helpers, tweaks santa/shuttle loan times

* hourS
2018-02-21 12:38:09 -05:00
ShizCalev
d0f10d151e [s] Cameranet fixes (#35733) 2018-02-21 10:30:27 -03:00
Leo
b453c6be6d Removes unnused random event 2018-02-18 09:06:15 -06:00
AnturK
a5bcb83ea7 Some antag fixes. (#35690)
* Removes misleading comment

* Fixes devil ascension visible in lobby

* Fixes nuke op reinforcements.

* ADVANCED COPYPASTE

* Missed this one.
2018-02-16 11:34:38 -05:00
AnturK
4c2f2b955b Converting more auto_custom antagonists. (#35484)
* Thinning out auto_custom uses.

* Not sure what i was thinking.

* Not sure what happened here.

* Fixes

* Forgot i'm doing this so i can remove this

* C

* Valentine antag datums

* This is what i get for adding it manually.
2018-02-16 01:44:41 -05:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
ShizCalev
0195f03435 [s]Fixes writing bugs/exploits (#35552)
* literacy crisis

* cleanup
2018-02-16 11:09:16 +13:00
Tad Hardesty
bbe4d12d13 Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:21:25 +01:00
AnturK
d3cb9c2b9a Greentext antag datum and OnRoundend hook. (#35584)
* Greentext antag datum and OnRoundend hook.

* review stuff
2018-02-13 20:43:24 -05:00
vuonojenmustaturska
7c67b5a9b4 Disables clogged vents until it can be reworked 2018-02-13 18:46:02 -06:00
oranges
216a606fe1 Merge pull request #35583 from TehZombehz/valentines_chocolate
Adds heart-shaped boxes of chocolate to the valentines event
2018-02-14 09:12:03 +13:00
vuonojenmustaturska
e121f0beaa Merge pull request #35571 from ShizCalev/spider_infestation-fix
Fixes spider_infestation event
2018-02-13 18:23:07 +02:00
TehZombehz
899968bc7f Adds heart-shaped boxes of chocolate to valentines event
Also fixes the description of egg cartons.
2018-02-12 01:45:02 -06:00
ShizCalev
faf4c17972 Sanity check for sentience event 2018-02-11 21:24:48 -05:00
ShizCalev
33c83c0915 Fixes spider_infestation event 2018-02-11 21:24:21 -05:00
MoreRobustThanYou
1c42a8186a Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 22:01:55 +13:00
Iamgoofball
4eb008f5bb Nerfs Clogged Vents Harder (#35317)
* Nerfs Clogged Vents Harder

nnow requires 50 people minimum, lowers the weight down to 25

* Update vent_clog.dm
2018-02-05 22:01:54 +02:00
ShizCalev
ee18d6f8e2 Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#34907)
* Cleanup

* .

* Synced special_role & factions with role defines

* Revert

* more cleanup

* fix
2018-02-04 03:03:34 -06:00
Iamgoofball
725df4bd9b Buffs Clogged Vents (#34949)
* Buffs Clogged Vents

🆑 Iamgoofball
feature: Clogged Vents now has some teeth
/🆑

This was the only part of GoofEvents players liked

* Update effects_foam.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm

* Update vent_clog.dm
2018-02-04 02:51:47 -06:00
vuonojenmustaturska
97d4e59d87 Armor datums (#34793)
* Draft 1

* requested changes

* fixes & refactoring & vv support

* one more vars access

* there we go

* change arg name

* Update lava.dm

* Update armor.dm

* Update armor.dm

* Update armor.dm

* fixes

* Update datumvars.dm

* Update goliath_hide.dm

* Update objs.dm

* 0 -> none in checkrights()

* Update armor.dm

* Update datumvars.dm

* Update armor.dm

* Adds magic armor type

this did not exist before

* two missing things from previous commit

* I shouldn't webeditor at work
2018-01-25 10:27:36 -05:00
ShizCalev
88904bdcd4 Adds new landmark icons (#34848)
* Adds new landmark icons

* Update

* Blue
2018-01-24 19:08:21 -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
oranges
450278651d Merge pull request #34767 from AutomaticFrenzy/patch/replace-random-law
Fix replace_random_law runtime
2018-01-23 20:41:45 +13:00
Tad Hardesty
1be60a2cd3 Fix replace_random_law runtime 2018-01-22 16:46:46 -08:00
ShizCalev
70df93acc1 Fixes portal storm event (#34725) 2018-01-22 20:24:38 -02:00
Tad Hardesty
35faafa8bc Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 20:33:11 +01:00
ShizCalev
ae2a8dc467 Fixes rev mindswap (#34567) 2018-01-21 19:28:41 +01:00
Jordan Brown
8a60f85b33 Merge pull request #34578 from coiax/lightsout-lightsout
Removes lightsout landmark
2018-01-19 10:18:39 -05:00