Commit Graph

45930 Commits

Author SHA1 Message Date
Jordie 945c19b5ec Merge pull request #42382 from coiax/heirloom-observer-check
Observers can tell if an object is a family heirloom on examine()
2019-01-18 22:56:04 +11:00
tralezab a89c5aee03 [READY] petting all dogs makes you happy, petting cats now makes you happy #freepugs (#42373)
fixes #42361
closes #42363

i changed the moodlet instead of where the wuv proc is, so it should pick the initial name of the dog and say something like "pugs are so adorable! i can't stop petting them!" but for all kinds of dogs

the only thing is that this name doesn't change if you pet a pug and then a corgi because they are classified as the same buff, i could make the name of the buff the same as the mob you are petting so you could stack happiness but that would be a balance change, imagine how happy you could get locked in a room with every kind of dog in the game
2019-01-19 00:13:04 +13:00
4dplanner 7c1445dbf2 Hierophant burst is async (#42290)
I noticed that I had 4 hierophant kills logged on the stats hub, which is off
by about an order of magnitude. What happens is that on death hierophant
releases an expanding square, which you're meant to run from - this puts you
out of range for the medal.
2019-01-18 01:43:34 -08:00
Tad Hardesty 143907226f Fix compile error in ethereal light handling 2019-01-17 22:02:02 -08:00
Jordan Brown bfe87a1af9 Merge pull request #42377 from WarJenkins/booger13-master
Adds the ability to create circuit floor tiles
2019-01-17 16:33:26 -05:00
Jordan Brown 56b71f9184 Merge pull request #42394 from tgstation/optimumtact-patch-1
Stop alien infestation failing
2019-01-17 16:14:41 -05:00
coiax 881e8c1ab9 Refactors NODROP flag into TRAIT_NODROP (#42109)
* Refactors NODROP flag into TRAIT_NODROP

🆑 coiax
fix: Anti-drop implants can no longer be used to drop objects that they
were not responsible for sticking to a person's hand.
fix: Backfiring with a Barnyard spellbook will now play a spooky horse sound.
refactor: Refactors the way that "NODROP" items work to a new system,
there should be no change in functionality.
/🆑

Various items in the codebase were doing weird hoop jumps in order to
preserve the nodrop flag's state when it also wanted to change it, so I
moved it to a trait system.

I may have gone overboard with the type of unique trait sources, but
those can be changed later. My long term plan is make a general "CURSED"
nodrop origin, which means you can unlock cursed items by being hit with
a bolt of door opening or something. But that's for another PR, this has
no functionality changes, apart from some slightly modified descriptions
on cursed masks.

- Removed a bunch of redundant voice changing code for all the voice
changing animal masks, used two new clothing flags for this purpose.
- Also refactored a bit the animal masks, making new cursed subtypes that play
the sound when created.

* Drop location
2019-01-17 15:24:30 -05:00
Jordan Brown b08fa6d326 Merge pull request #42393 from 81Denton/life-day
Adds Life Day holiday
2019-01-17 15:00:31 -05:00
81Denton 06387f8cf7 Imagine being so fat you look at a space station and see food (#42392) 2019-01-17 12:33:12 -07:00
Dax Dupont 4f9d04bc32 This is a family friendly codebase (#42385) 2019-01-17 11:35:23 -05:00
Cauã dos Santos Rebelo 5e22e87bf0 Adds Blank Paper, a new mime cocktail (#42366)
Adds a new drink, made by mimes, for everyone! It was based in a costum drink that had the flavour text of eraser, nothing and future! 

Recipe is 1 part Silencer, 1 part Nothing and 1 Part Nuka Cola (it also heals mime like most mime drinks do)

cl BebeYoshi & Hexmaniacosanna
add: A new drink called Blank Paper was added to the bar menu, it was made by a mime and it represents a new start.
/cl

[why]: This was a special costum drink and we thought it deserved its own cocktail, besides, mimes needs more unique things (even if you don't even need a mime to make it).
2019-01-17 23:18:05 +13:00
tralezab 0633947862 Fix grammar in time desynchronizer (#42372) 2019-01-16 20:41:47 -08:00
granpawalton 36d64d231e Lowers CO2 fusion power and slightly bumps up nitryl (#42246)
* lowers CO2 fusion power from 3 to 1.2

* raises nitryl fusion power from 15 to 16

* bad calculation, raises CO2 from 1.2 to 1.25
2019-01-16 17:22:21 -05:00
oranges 12170a6978 Stop alien infestation failing
It appears that some vents do not have any parents, so there is a null runtime when trying to check other_atmosmch 

The event then fails
2019-01-17 11:11:03 +13:00
granpawalton 4c8d35cbbe allows proffesion belts to hold their appropriate holosign (#42376) 2019-01-16 17:08:07 -05:00
Mickyan ca84639286 Allows coloring objects with spray cans (#42327) 2019-01-16 16:43:04 -05:00
81Denton b5a2a3ab7e Adds hygiene and nutrition scan options to scanner gates (#42364)
* Adds hygiene scan to scanner gates

* Adds nutrition scanning modes

* Adds explicit selection for low and high hygiene levels

* ishuman()
2019-01-16 16:35:30 -05:00
Denton 23111a51bc Adds Life Day holiday 2019-01-16 21:53:09 +01:00
Jordan Brown 66d3edfaaf Merge pull request #42284 from Menshin/tgui_pacman
tgui'ed P.A.C.M.A.N interface + some minor fixes
2019-01-16 14:04:23 -05:00
Jordan Brown 2af87bcd0d Merge pull request #42354 from tortellinitony/cig_refactor
Cigarettes extinguishing and vapes refactor
2019-01-16 13:58:08 -05:00
Qustinnus e1d360ff05 [ready] Golem DLC pass 2018 (Adds new golem types) (#41951)
* Bronze golem

* adds creation

ad

* removes shit adds shit

* temp

* fff

* bone, leather and cardboard

* fff

* boneyard

* temp

* ahahahha dumb moron

* adds durathread golem sprites

* reee

* ass

* Auto stash before merge of "golemgang" and "origin/golemgang"

* fix

* uuh

* d

doned

* remove dupe
2019-01-16 13:42:20 -05:00
Jack Edge 8a4f1e9081 Observers can tell if an object is a family heirloom on examine()
🆑 coiax
tweak: Observers are able to see family heirloom messages when examining
objects.
/🆑

I mean, it bugged me the once time that I suspected a random object was
an heirloom, but had to use VV to check.
2019-01-16 07:48:28 +00:00
bgobandit ed3f3af978 Moves valentines/candyheart messages to json; adds new text (#42358)
* Moves valentines/candyheart messages to json; adds new text

* commas are my passion i love commas more than anything in the world give my valentine to commas and then FUCKING KILL COMMAS HOLY FUCK GOD

* commas.

* EVEN MORE VALENTINES

* I can't stop
2019-01-16 14:56:03 +13:00
coiax dd22f63ca8 Fix communication disorder plus mutadone causing chat spam (#42340) 2019-01-15 17:18:22 -08:00
Vile Beggar 36709a3c1d boo 2019-01-16 00:37:34 +01:00
bgobandit aeb603cb40 Clicking the health doll lets you examine yourself for injuries (#42357) 2019-01-15 17:12:29 -05:00
duckay 9cf3c5bbf8 Assistant Traitor Item: Part Electric Boogatwo (#42297)
* toolbox pls

* rstar

* Update uplink_items.dm

* contents, force

* i

* toolbox now costs 2 tc

robuster

* "toolbox"

* grammar mistake

* bust < bash

* description is better

A old, blue toolbox, it looks robust.

* changed bash skulls to bust heads

because i just watched the space station 13 video again

* yuh

* asdf

* throw!

* uplink now notes that it increases in damage
2019-01-15 12:13:36 -05:00
bgobandit 4466609c9e Resisting out of bucklecuffs takes an amount of time dependent on cuffs used. (#42344)
* Resisting out of bucklecuffing will now take different amounts of time based on the cuffs used.

* removes stray reference to "one minute"

* makes cobby's change
2019-01-15 12:11:32 -05:00
PKPenguin321 69322649af dna console grammar (#42359) 2019-01-15 08:52:09 -07:00
Jordan Brown bf880ffde2 Merge pull request #42298 from coiax/spot-the-satchel
Fixes smuggler's satchels not being visible with t-ray
2019-01-15 09:27:08 -05:00
coiax d8f84ca966 Desc/iconifies various pills, admin floorpill bottles (#42229)
* Renames aranesp, desc/iconifies various pills, admin floorpill bottles

* Unrenames
2019-01-14 17:32:40 -05:00
81Denton 35ebc44fab Rearranges uplink items (#42339)
* Rearranges uplink items

* arranges TC order
2019-01-14 17:23:01 -05:00
Jack Edge dd7dfb9594 2->1 2019-01-14 20:39:47 +00:00
coiax a7db6d6c82 Item fortification scroll changes (#42173)
* Item fortification scroll changes

* Code review
2019-01-14 12:29:05 -05:00
Jordan Brown 1a5d15348c Merge pull request #42335 from coiax/remove-metal
Gives admins a button to remove metal + cult dagger from Cultists
2019-01-14 10:34:34 -05:00
Jordan Brown 2b3b3ef80e Merge pull request #42329 from zxaber/Malf_doomsday_clamping
Fixes Malf AIs spawing multiple doomsdays
2019-01-14 10:33:42 -05:00
Jordan Brown a9ecf5955a Adds more holiday stuff. (#42348) 2019-01-14 10:02:12 -05:00
carshalash 312a49dfc0 Alcohol value tweaking (#42349)
* Update alcohol_reagents.dm

* Update alcohol_reagents.dm
2019-01-14 10:01:59 -05:00
Dax Dupont b1c8a8c982 Fixes supermatter extraction again (#42326)
* WHAT THE FUCK YOU FUCKING MORON

* includes parts of dent

* let's talk about floyd with his dumb ass prs, who the fuck asks for or wanted hygiene except fart fetish lovers, seriously musk/body odor is one of the weirdest and shit fetishes there are why are we enabling floyd's fetishes my god man the maintainers are a disappointment jesus christ.
2019-01-14 09:48:26 -05:00
oranges 8129713922 Merge pull request #42332 from Jordie0608/nowyoucanalsopretendyourebanningabstractart
Banning panel change and two fixes
2019-01-14 14:48:00 +13:00
tortellinitony 7863c4a393 Add extinguishing to cigarettes and lighters. Makes vapes use container flags. 2019-01-13 13:00:48 -05:00
bgobandit 40cd1fafab Adds more holiday stuff. 2019-01-13 02:17:40 -05:00
Time-Green 6295991056 fixes mutations instantly activating on species change 2019-01-12 18:24:05 +01:00
Jack Edge e6991a0bd2 Gives admins a button to remove metal + cult dagger from Cultists
🆑 coiax
admin: Admins have a button to remove the runed metal and cult dagger
from cultists.
/🆑

Could have used this in a previous round.
2019-01-12 17:06:14 +00:00
Jordie0608 20d2bbd8bc new ban group for appearance, emote and ooc, fix javascript error and role bans dcing client 2019-01-12 19:14:29 +11:00
Jordie 0c92e1d8e4 Merge pull request #42314 from coiax/buff-spiritual
Improves Spiritual quirk
2019-01-12 18:02:30 +11:00
Jordie 9b1e965e1e Merge pull request #42306 from coiax/beer-googles-buff
The signature barman booze sliding is now granted by their beer goggles
2019-01-12 17:55:08 +11:00
Jordie 443aec87b2 Merge pull request #42302 from coiax/random-items-into-spawners
Changes the type pathing of some "random" items
2019-01-12 17:46:16 +11:00
zxaber aed25b289e adds a check for doomsday being active 2019-01-11 16:46:58 -08:00
Suicidalpickles 289f242be7 Adjusts vehicles to new movement delay (#42273)
* changes secway movespeed

title

* adds other vehicles
2019-01-12 12:05:13 +13:00