Commit Graph

2988 Commits

Author SHA1 Message Date
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
Armhulen
84d4b3aae6 Mushroom people, revived! (#35858)
* caps fixed, small other fixes and mushpunch

* honey, i fixed the bugs!

* STUPID YORII DUMB GIRL STINK LEAVE

* boolean is such a fun word

* zoinks

* F_XED

* fixes part 2

* TRUEs and FALSEs

* don't drink and code boys unless you're goofball or like maybe kor

* for entirely different reasons i mean

* at what point is goofball too drunk to troll but not drunk enough to shitcode

* cool your jets, travis.

* what a TRAVIS-TY

* mush added to yet another blacklist!
2018-03-07 21:34:56 -06:00
kevinz000
28b1fb254d RND TECHWEBS: TECHFABS (#36055)
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-08 15:09:44 +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
Cameron!
083eefb6b9 Adds Medical Sprays (#36081)
* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Update packs.dm

* Volume adjustment, attack_self addition

* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Volume adjustment, attack_self addition

* Adds Medical Sprays

Medsprays are a new application method for chemicals, functioning like a multi-use patch with an internal chemical reservoir.

This allows touch chemicals to be applied more precisely and with a delay, rather than instantly and imprecisely with a spray bottle.

Pre-loaded medsprays with styptic powder or silver sulfadiazine can be obtaiend from the NanoMeds, and empty ones will spawn in the secure chemical locker.

They will also come from the medical pack from cargo.

* Volume adjustment, attack_self addition

* Forgot this

* removes unnecessary/annoying check

* replaces deprecated sterilizer spray bottles on Pubby

* Applies MrDoomBringer's sprites

* new sprites, by @MrDoomBringer

* two-line shuffle

* fixes double entry

* Adds logging

* code standards
2018-03-06 13:37:25 -05:00
Iamgoofball
5e65110b5f SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#36121) 2018-03-04 14:57:39 -06:00
Tad Hardesty
ad3533e6e9 Merge pull request #36054 from AutomaticFrenzy/patch/fancy-tables-2
Fix placement of fancy tables in the editor
2018-03-03 17:31:15 +11: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
Ashe Higgs
d1edd8f505 Alternative PR to brass apples: Adds bronze sheets (#35874)
* Adds bronze sheets

* nope!
2018-03-02 13:35:58 +13:00
Tad Hardesty
0b336ed1fa Fix icon of black fancy table in editor 2018-02-28 16:44:20 -06:00
kevinz000
6c0974d1a5 Revert "Mekhi goes on the table" 2018-02-25 15:23:27 -08:00
BordListian
6da8820fee Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)
* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one
2018-02-23 21:34:53 +02:00
ShizCalev
0de3dae689 Lets silicons disable morguetray alarms at range (#35855) 2018-02-23 14:27:28 +02:00
nicbn
53537c9f6a Update morgue.dm (#35883) 2018-02-22 20:40:17 -05:00
Buggy123
d7244bc0d3 tabling people on brass tables makes a clanging sound (#35876)
* tabling people on brass tables makes a sound

* fixes syntax

* more syntax fixes
2018-02-22 14:31:03 -06:00
QualityVan
c91cdd7380 Adds five second cooldown to morgue tray beeps (#35818) 2018-02-21 23:47:59 -05:00
Buggy123
fb564b6981 Makes the morgue beep disable step clearer
cl
tweak: Nanotrasen has begun a campaign to inform their employees that you can alt-click to disable morgue tray beeping.
/cl

If its annoying you literally just alt-click to disable it. There's basically no situation where you would be able to hear it without being able to turn it off, except maybe the one morgue tray in the brig if you don't have access to the windoor (but just fucking ask sec to disable it).
2018-02-22 09:26:03 +13:00
Ashe Higgs
e54ccddec8 Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759)
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
2018-02-20 18:09:59 -05:00
Dax Dupont
221374e10b Reflectors now reset the range of a projectile like before! (#35726)
* Reflectors now reset the range of a projectile.

* how about dem apples
2018-02-17 14:17:11 -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
ShizCalev
0195f03435 [s]Fixes writing bugs/exploits (#35552)
* literacy crisis

* cleanup
2018-02-16 11:09:16 +13:00
Jordan Brown
9e53045bd3 Merge pull request #35661 from MrStonedOne/patch-483
Mekhi goes on the table
2018-02-15 09:49:02 -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
Kyle Spier-Swenson
099b08fa97 Mekhi goes on the table 2018-02-14 00:32:29 -08:00
vuonojenmustaturska
960f42d292 Merge pull request #35531 from ACCount12/mining_tool
Mining tools now use tool system
2018-02-13 18:33:52 +02: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
ACCount12
f43fcbd1d6 Replaces istype checks for mining tools with tool_behavior checks 2018-02-13 00:09:50 +03:00
ACCount12
2169e8638c Makes mining tools use use_tool and have tool_behaviour 2018-02-13 00:09:50 +03: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
MoreRobustThanYou
aca0cd453a Urinal cakes can now be picked up again (#35566)
* Urinal cakes can now be picked up again

* Update watercloset.dm

* Update watercloset.dm

* Update watercloset.dm
2018-02-12 17:01:11 +02:00
Jordan Brown
47ed29cb5b Merge pull request #35514 from ShizCalev/ghost-role-syndi-access
Fixes wrong ID for syndicate ghost roles
2018-02-11 16:34:17 -05:00
MoreRobustThanYou
4268e48880 Makes urinal cakes more realistic (#35515)
* Add files via upload

* Makes urinal cakes blue

* Add files via upload

* Delete urinalcake_squish.png
2018-02-11 16:29:38 -05: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
uraniummeltdown
ac9964be70 Buildable Shuttle/Plastitanium Windows (#35376)
* use titanium/plastitanium on unanchored reinforced fulltile window to make shuttle/plastitanium windows

* updates titanium/plastitanium sprites, adds titanium glass and plastitanium glass, fixes material amount in mineral glass
2018-02-10 18:49:43 -05:00
ShizCalev
9dfeb83ebd others 2018-02-10 15:24:58 -05:00
ShizCalev
dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
vuonojenmustaturska
dd9ae40cf7 Merge pull request #35360 from Robustin/blackmirror
Removes synths and androids from magic mirror
2018-02-07 12:41:12 +02:00
vuonojenmustaturska
a1c73db03c Merge pull request #35363 from Xhuis/chair_nerf
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 12:38:32 +02:00
Jordan Brown
bd489f1aff Merge pull request #35349 from DaxDupont/ifuckinghatethese
Moves the pocket protector to lockers instead of on the uniform.
2018-02-06 11:45:19 -05:00
ACCount
100c4b6114 Adds new helper: use_tool, shakes things up in tool code (#35095)
* small changes

* Adds a use_tool helper and changes some tools to use it

* Ports most tool operations to use_tool

* Converts more tool operations to use_tool and tool_act

* Changes some things to default_unfasten_wrench

* Improves tool_behavior support in mech construction

* Code review memes

* Fixes all instant use_tool calls failing

* Code improvements

* merge fixes
2018-02-06 11:02:53 +01:00
nicbn
9348ad9aad Fixes bloodpack sprite issues (#35288)
* Fixes bloodpacks with question marks

* .

* .

* .
2018-02-05 20:21:13 -05:00
Xhuis
48de810fbd Kills tactical brass chairs 2018-02-05 15:51:56 -05:00
Robustin
03237ad529 More mirror species blacklisted 2018-02-05 14:22:06 -05:00
Dax Dupont
d874e90906 Moves the pocket protector to lockers instead of on uniform 2018-02-05 17:29:27 +01:00
MMMiracles
6c2db52ab3 Snowdin 2.0 (#35000)
* wrah wah wah waaaah

* fences, new mountain turfs, sprites, top-side finished, misc stuff

* quick fix

* cut my life into pieces, this is my last resort

* lots of work done to the underground segment, more fluff bits and topside work

* removing depreciated bits and tgm conversion

* step_off

* damn these dirty VARS

* changes n stuff

* wanna build a plasmaman?

* decals commit fix

* map detailing, loot spawns, plasma miners, cyberboss changes, plasma lava turning people into plasmamen

* tgm conversion

* new barricade sprites, final map edits before testing

* mountain wall fix

* Update snow_storm.dm

i ate too mucha pasta
2018-02-05 17:09:34 +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
Buggy123
b2c456df73 Morgues now beep if the mob is clonable. (#34622) 2018-02-04 02:57:57 -06:00
nicbn
dc09b1763e Adds tiny shards (#35070)
* Adds tiny shards

* .

* .

* .

* .

* .

* .
2018-02-04 02:40:01 -06:00