Commit Graph

1345 Commits

Author SHA1 Message Date
JStheguy
8d5b771108 Electronic assembly changes and additions (#36394)
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there
2018-03-19 20:09:38 -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
Qustinnus
ea7896d0e0 Lavaland / Lavaplanet is now visible from space (#36419)
* adds lava planet

* fixes oldcode

* im dumb

* Random position

* UHHHH, I'll take a diet lavaplanet please, no ice.

* fixes init
2018-03-16 14:30:13 -04:00
Buggy123
dff70097cd Hopefully fixes unnecessary nightshift announcements (#36173) 2018-03-10 19:46:48 -06:00
TheDreamweaver
f4e0f567ef Replaces alien brain necropolis chest loot with new artifact [MERGE READY] (#36143)
* -Replaces alien brain necropolis chest loot with new artifact
-Adds new artifact to necropolis chests loot, the Rod of Asclepius
-Adds corresponding status effect and defines

* Update necropolis_chests.dm

fixed spelling

* Spelling FIx

*disperses

* Fixed spelling, lowered the boost to the owner, added oxy heals, and refactored some of the code

* Adds some form of sprites (Still subject to change)

* Adds new sprites, fixes slime people taking toxin damage, and adds the rod to list of snake phobia objects.

* Nerfed clone healing and simple animal healing, fixed healing while dead as well as added a death event, tweaked the sprites, and cleaned up some code.

* Fixed grammar and cleaned up some code.

* Further cleaned up code because Cobby is mean.

* FURTHER cleaned up code
p.s. please send help, Cobby is holding me hostage
2018-03-10 02:52:03 -06:00
Dax Dupont
cffedcf7c1 Display cases can now have a list where to randomly spawn items from (#36058)
* Adds allowing display cases to pick from a random list

Keeps compatibility with older maps and moves trophy/plaque message to all display cases

* A bit more legible

* Refactors statues tool interaction code

* Don't override it already exists

* done
2018-03-09 09:17:57 +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
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
Ashe Higgs
5c8d845f56 [s] Improves and secures trait assignment code, allows their pref to be changed midround, tweaks RDS and Night Vision (#36160)
* Traits but less buggy

* no tick while dead

* fix security vuln
2018-03-06 15:57:42 +02: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
Jordan Brown
9babf49552 Merge pull request #36082 from AutomaticFrenzy/patch/nightshift-fix
Fix nightshift skipping certain maint APCs
2018-03-05 00:29:36 -05:00
kevinz000
4cf3c7cd2c Adjusts fire priorities of flightpacks, research, networks, and fields. (#36129)
* Fire priorities

* research lower not higher

* Don't need to keep timing if it's automatically compensating for missed ticks.

* Spelling

* spelling
2018-03-05 00:25:03 -05:00
Tad Hardesty
932aac2e25 Tidy nightshift code 2018-03-04 17:05:57 -08:00
Tad Hardesty
eb9dec405f Fix nightshift skipping certain maint APCs 2018-03-02 01:48:44 -08:00
Ashe Higgs
ab9e2e8902 Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
* Roundstart traits

* Unspaghettifies night vision

* Fuck everything

* Issues patch
2018-03-02 13:39:44 +13:00
Sirenfal
937ad3afc7 Antagonist reputation system (#35485)
* Implement antagonist reputation system

* Cleanup

* Quadruple point values, maybe a bit underwhelming before

* Simple feedback changes. Waiting on input on a couple questions for the other requests.

* * Comment out unnecessary variable

* Half of the requested changes (testing in game pending, standby)

* Last set of changes. This should be finished now.

* Remove line causing a warning to fix Travis build
2018-03-02 13:38:49 +13:00
Jordie
23a45889ed Modernizes SQL admin loading (#35264)
* updates sqladmins with excluded flags and tempminning

* rank, editing and permission protections; json backup

* fixes

* reverted the wrong file

* fix slidecolor cascading and disabled switches not being sent in form

* removes debug uncommenting

* whoops this too

* commas fix + versions for changelog entry headers since 3.0

* actually account for can_edit_flags and use of @ with - or *

* fixes and rearrangement of admin > localhost > autoadmin precedence

* in case you want to not have autologin autoadmins
2018-03-02 13:38:26 +13:00
vuonojenmustaturska
8da498119d Removes SNPCs (#36016)
* he's dead, jim

* a few stragglers

* Restores the populate world-verb
2018-02-28 19:11:34 +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
Jordie
a8d35c73c4 Fixes first_death check (#35944)
* Update blackbox.dm

* Update blackbox.dm
2018-02-25 22:03:04 +02:00
Jordan Brown
845743c1ce Merge pull request #35912 from ShizCalev/time-cleanup
Cleans up some time stuff with DisplayTimeText
2018-02-24 00:38:16 -05:00
kevinz000
e666bc63e1 24x --> 12x station time rate (#35886) 2018-02-22 20:42:04 -05:00
ShizCalev
3ab8b52cd3 Cleans up some time stuff with DisplayTimeText 2018-02-22 15:33:45 -05:00
KomradeSpectre
e156b17733 Ports Barometers from Yogstation (#35730)
* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.
2018-02-22 12:50:42 +13:00
arsserpentarium
5d11121c14 [READY]Astar improvement (#34713)
Improvements to A* via using bitflags to find directions and caching already checked directions so we don't recheck them.
2018-02-22 10:16:38 +13:00
Jordan Brown
362276848f Merge pull request #35775 from kevinz000/night_shift
[READY]Randomized Station Time + Night Shifts
2018-02-21 13:01:33 -05:00
kevinz000
8ebc63d2f2 Randomized Station Time + Night Shifts 2018-02-20 21:59:44 -08:00
Jordie
be55b1d3a6 Removes duplicate first death log (#35832)
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
2018-02-20 18:58:25 -06:00
Ashe Higgs
d3d65ed466 The end-round report now shows the name, area, ckey, damage taken, and last words of the first person to die that round (#35582)
* Adds a "first death" feature to the roundend

* no clogging up with antag-rollers

* fixes red text color

* Maintainer review (finally, sorry)
2018-02-20 09:46:41 +13:00
Anonmare
09614fd426 Adds several new phobias (#35436)
[Changelogs]: Adds four five several new phobias to the ones you might receive, careful, you don't want to be a cultist afraid of your own God now, do you?

cl
add: Nanotrasen psychologists have identified new phobias emerging amongst the workforce. Nanotrasen's surgeon general advises all personnel to just buck up and deal with it.
/cl

[why]: Because I think it would be fun and makes traumas more... Traumatising?
2018-02-20 09:39:59 +13:00
BordListian
cc47143bca - Fixes multiserver mining
- Removes redundant value on research subsystem
2018-02-18 12:42:47 +01:00
Leo
a2ccca5f96 All medal methods are handled on SSmedals as opposed to global procs and also have proper defines. Killing with a crusher grants special medals. (#35673) 2018-02-16 13:17:51 -05:00
vuonojenmustaturska
329ff642a8 Merge pull request #35692 from Cyberboss/GarbagePreInit
Moves garbage up in the init order
2018-02-15 16:53:41 +02:00
Cyberboss
95b9b07024 Moves garbage up in the init order 2018-02-15 09:31:42 -05: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
Robustin
6a5c750fb5 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 16:17:58 -05:00
Jordan Brown
31ce6b5b90 Removes runlevels spec from SSoverlays (#35455) 2018-02-10 12:02:05 -05:00
Jordan Brown
3aab6bba8b Atom initialization counter only shows up in TESTING mode (#35428) 2018-02-08 20:11:54 -02:00
KorPhaeron
d962858116 Fixes smugglers satchels being able to refresh items forever (#35270) 2018-02-05 02:08:17 -02:00
Jordie
71ca25afbb Merge pull request #35120 from tgstation/a
Revert "Removes unused consts from dbcore (#34711)"
2018-01-31 09:08:36 +11:00
vuonojenmustaturska
aac03311d7 Merge pull request #35125 from Cyberboss/BlameTheBee
[s] Fix bobby tables
2018-01-30 23:38:27 +02:00
MoreRobustThanYou
65fd10893d Announced messages while drunk will be slurred (#34651)
* Announced messages while drunk will be slurred

* Minor announcements, too!

* Update requests_console.dm

* Update communications.dm

* Fixup.

* Update requests_console.dm
2018-01-30 02:42:42 -05:00
Cyberboss
f3cf3c5e2d Revert "Revert "Fix sql injection""
This reverts commit 23eeb4ac80.
2018-01-29 21:54:19 -05:00
Cyberboss
23eeb4ac80 Revert "Fix sql injection"
This reverts commit de4be23ff7.
2018-01-29 21:53:16 -05:00
Jordan Brown
de4be23ff7 Fix sql injection 2018-01-29 21:51:19 -05:00
Jordan Brown
d038551fbd Revert "Removes unused consts from dbcore (#34711)"
This reverts commit 1dc1bfcfef.
2018-01-29 16:32:43 -05:00
vuonojenmustaturska
355c21acb1 Remove mobs/idlenpcpool Initializers, make mob/client expansion happen when maxz is incremented (#34987)
* work

* Seems to worky

* one more place where maxz is touched
2018-01-27 23:16:20 +01:00
coiax
8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
Togopal
458c68143f [READY] SNAKES! (#34724)
* actual phobia created

* (LAST ATTEMPT) Adds Snakes

🆑 Togopal
add: Snakes! They hunt vermin on the station!
add: They can be purchased in cargo.
/🆑

Mice can be a problem in late round random events, and I figured releasing a bunch of snakes in maintenance would be a more long-term solution than constantly running around with a crowbar when you hear them.

Now with updated sprites!

(I apologize heavily for uploading this three times. I was unaware I was using an older fork, as this was my first attempt at modifying the code.)

* curator gets trauma! and fixes to snek trauma

* fixes the travis error

silly frog

* Reduces the cost of a normal snake crate in Cargo. Adds retaliation to snakes upon being attacked, removes venom from regular snakes.

I A

* quick fix

* quick fix 2

* fixes the cargo contains = list

* go away TRAVIS

* changes the name of the snake cargo crate of regular snakes to avoid confusion

* Updates how some snake mechanics works

Makes them actually retaliate, code is still sort of buggy though

* Some orange fixes

* Fix snakes on this motherfucking plane

* The thing oranges said
2018-01-25 09:11:37 -06:00