Commit Graph

115 Commits

Author SHA1 Message Date
Tad Hardesty
b235fceca6 Fix wallets appearing to still contain a removed ID (#37719) 2018-05-09 18:30:29 +03:00
ShizCalev
ba1030f803 Makes more messages pronoun sensitive (#37582)
* Makes more messages pronoun sensitive

* Some cleanup

* more pronouns

* rever
2018-05-03 18:45:55 -04:00
Mickyan
242be5700f fixes midori cigs being empty (#37615) 2018-05-02 18:30:32 -04:00
vuonojenmustaturska
ccf8fc5bc5 Kills off three more flags from flags_2 (#37529)
code: More flags have been moved to their appropriate places
SLOWS_WHILE_IN_HAND
FROZEN
NO_MAT_REDEMPTION

all moved to item_flags
2018-04-30 10:32:23 +12:00
AnturK
52a99c09d6 Uppercase slot defines 2018-04-27 10:38:32 +02:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Jordan Brown
4fca080a0f Merge pull request #37381 from DaxDupont/toolbelts
Fixes toolbelts holding everything
2018-04-23 09:30:25 -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
Dax Dupont
399de6b59c aww yee 2018-04-23 13:47:27 +02:00
Dax Dupont
85b1b99f35 Fixes toolbelts holding everything 2018-04-23 13:33:51 +02:00
AnturK
e1d9283c09 Fixes some defines. (#37223) 2018-04-16 16:32:05 +03:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
John Ginnane
ff20954971 Fixed sometimes using items on full storage items (#36711)
* Fixed sometimes using items on full storage items

* Removed redundant code and fixed spray being used on container
2018-04-04 11:02:44 +12:00
Ashe Higgs
bd42041c9c Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)
* Adds some more traits

* April Fools' heirlooms

* Fixes the detective sound

* Refactor to use signals
2018-03-28 16:14:08 +03:00
Armhulen
5ed2a56ced Refactors Spell and Martial Art Books to use Action Granters! (#36442)
* HE'S DONE IT

LETS GOOOOOOOOOOOOOOOH

* floyd. floyd. he's the floyd. floyd dude yeah yeah yeah yeah FLOYD

* fireball remarks, the other spells.

* YOU MEAN THE CHAOS FLOYDS

* what is a floyd, but a miserable pile of moodlets

* flflflflfoooaooayoyydd FLOYOYODDD DFFRRURURMPPFF

* FLOYDING LIGHTS LIGHTS LIGHTS LIGHTSSS

* GORGE YOUR MOODLETS, EMBRACE YOUR FLOYD

* no more floydposting, i removed the old spellbooks

* aaaaaaaaaaaaaaaaaaah ALL of the remarks added my fucking god

* 10 days to sunday travis.

* last minute fixes

* 1 fix

* 2 fix

* red fix

* martial granters

* MAMA MIA
2018-03-27 20:51:14 +03:00
fludd12
97534f2ac3 [Ready] Slime Crossbreeding! (Part 1 of 2!) (#35986)
* Slime Crossbreeding!

* Shifts a few things around.

* Prismatic extracts!

* Self-sustaining extracts!

* Consuming extracts!

* Recurring extracts!

* Whups!

* Regenerative extracts!

* Stabilized (unfinished)

* More stabilized!

* This took more effort than it should have.

* Industrial extracts!

* Icons!

* Colors the crosses.

* Bugfixes galore!

* Burning extracts!

* Sounds!

* Starts on burning extracts.

* Charged extracts!

* Minor adjustments to the adamantine shield.

* Fixes map! Ready!

* Fixes problem children, changes consuming extracts

* I'm an idiot.

* Fixes playsounds, unnecessary srcs.

* Removes a gross text2path

* Resolves a conflict

* More AnturK fixes.

* Fixes two other things, too.

* Burning black extracts use shapeshifting now.

* Love Potion now mostly RP in use, aligns user factions.

* Iterative discovery of status effects.
2018-03-21 21:04:26 +01:00
vuonojenmustaturska
0714b6a4da inquisition ert tweak (#36511) 2018-03-19 20:25:55 -04: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
Polyphynx
abcf7361e0 Medical sprays can now be added to medical belts and smartfridges (#36313) 2018-03-12 11:49:35 -04:00
vuonojenmustaturska
6aabcac079 Create ERT refactor (#36321)
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
2018-03-12 23:48:09 +13:00
81Denton
3e1ff37869 Lets belts hold additional job-specific items (#36323)
* lets belts hold holoprojectors

* OH DUDE FOUR STRENGTH FOUR STAM LEATHER BELT AHH

* remote signaling device
2018-03-12 00:54:45 -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
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
XDTM
2ac902ab3c Refactors anti-magic into a component (#35639)
* Refactors anti-magic into a component

* plenty o stuff, mainly holy and antimagic traits

* fix

* fix2

* moved to components, moved some of the logic to the component

* don't blame me if the code looks copypastey

* right
2018-02-26 09:45:12 +13:00
ThePainkiller
33a54bc7bb Black Fedora opens its inventory on-click like the Detective's Fedora (#35891)
* Black Fedora opens its inventory on-click like the Detective's Fedora

Instead of having to drag the sprite to your character to access its inventory, behaves the same as the Detective's Fedora opening its container on click. Considering some dets prefer the black variation for noir flavour rather than the brown standard one they just have to pass his flask from one hat to another.
I had either this in mind or creating a new black detective's fedora variant on the det's cabinet that also had the flask inside it.

The only other item affected by this, if I'm not mistaken, is the improper CentCom hat.

* Update internal.dm

Removed the <priority> line altogether to trim the code
2018-02-24 01:09:07 -05:00
81Denton
14de0fd10d fentanyl (#35882) 2018-02-22 20:39:54 -05:00
Jittai
abb2337e14 New Donkpocket Box (#35835)
cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.
2018-02-22 09:16:16 +13:00
Xhuis
8977b00f02 Crew pinpointers now fit on medical belts 2018-02-17 00:49:49 -05:00
Jordan Brown
d282c60c7d Quote the armor lists (#35668) 2018-02-16 01:25:42 -05:00
TehZombehz
592c03e114 Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:08 -06:00
TehZombehz
4456a0a5bb Fix for invisible heartboxes 2018-02-13 18:08:30 -06: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
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
Dax Dupont
f658044e9b Adds the fake honking emag to the arcade. (#35457)
* Adds the fake honking emag to the arcade

* duuu

* Henk

* it's fake now

* Merge branch 'master' of https://github.com/tgstation/tgstation into prank

* How the fuck would replacing wirecutters with an emag even work

* saddsadsdsadsdsaadgfdsgghf

* k
2018-02-10 19:03:51 -05:00
KorPhaeron
1270132798 Mining sentience upgrade grants minebots a radio and ID (#35235)
* Minebots get mining radio+ID card

* Updates radio implant paths
2018-02-10 18:39:58 -05:00
Jordan Brown
f5ff686404 Merge pull request #35424 from ShizCalev/var-cleanup
Replaces some var values with defines
2018-02-10 12:10:40 -05:00
ShizCalev
f7fe600540 Cleans up vars with defines 2018-02-09 00:20:41 -05:00
Epoc
431bd05207 put lefthard/righthand directories in belts.dm 2018-02-07 00:06:00 -08: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
vuonojenmustaturska
c4fd8715a5 Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#35291)
* Ore Stacking

* honk

* honk

* component memes

* honk2

* fix overlay off-by-1, sheet singular names

* Give the ores more descriptive names since sheets also have

* whoops debug memes

* atom editor memes

* fixes

* snowdin fix
2018-02-05 22:27:35 +01:00
KorPhaeron
d962858116 Fixes smugglers satchels being able to refresh items forever (#35270) 2018-02-05 02:08:17 -02:00
81Denton
eaa3a07597 [Ready] Rebalances Chameleon Kits for lowpop (#34972)
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
2018-01-28 01:29:04 +02: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
coiax
a00d4b16a4 Costumes for nuclear operatives (#34487)
🆑 coiax
add: Nuclear operatives that wish to fail in style can purchase Centcom
Official and Clown costumes. They can also buy a defective chameleon
kit.
/🆑

It's funny. Other costume ideas welcome.

    Also merges two Initializes in camo guns
    Centcom Inspector outfit does have a Centcom headset, but it has no encryption chips. The outfit also is missing an egun.
    Removes the "Stealthy" description from camo shoes in the nuke op uplink they buy the same damn shoes, they're just more expensive for immersive and plausible reasons.
2018-01-25 08:58:00 +13:00
MrDoomBringer
20a6c0cdd7 Adds ~70 more suicides (#34522)
Does what it says on the tin, probably a terrible idea
2018-01-23 20:38:31 +13:00
Robustin
cb2fe1fe81 Revert Holy BBS check 2018-01-17 16:40:17 -05:00
oranges
30ea4d1a38 Merge pull request #34161 from ShizCalev/bot_sssembly
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
2018-01-13 23:21:58 +13:00
ShizCalev
bbf362eb50 Fixes non-holy mobs purifying BBS 2018-01-07 14:42:10 -05:00
ShizCalev
c4496dbd72 Consolidates bot assemblies under one parent 2018-01-07 13:43:46 -05:00