Commit Graph

6952 Commits

Author SHA1 Message Date
PKPenguin321
02f9740696 Esword cig lighting messages fix (#37216)
* fix esword cig lighting message

`Jeb Ray swings their the energy sword. They light the cigarette in the process.` becomes `Jeb Ray swings their energy sword. They light their cigarette in the process.`

* fix desword cig lighting message

`Jeb Ray swings his the double-bladed energy sword (Wielded). he lights the cigarette in the process.` becomes `Jeb Ray swings their double-bladed energy sword (Wielded). They light their cigarette in the process.`

* check fix

* desword check fix

* suggested message replacement

* suggested message change desword
2018-04-16 20:19:42 -04:00
Dax Dupont
efd69243e4 Fixes granters breaking on interrupt in final stage. (#37235)
* Fixes granters breaking when interrupted in the final phase.

* Missed one
2018-04-16 10:35:15 -05:00
AnturK
e1d9283c09 Fixes some defines. (#37223) 2018-04-16 16:32:05 +03:00
Grandmother of 50
d45a54348a Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)" (#37141)
* Update chameleonproj.dm

* Pseudo Lings need not apply

* Update chameleonproj.dm

* Update chameleonproj.dm
2018-04-16 05:39:21 -04:00
John Ginnane
d434cac5b7 Sender of PDA messages is told when their message is sent (#37055)
* Adds "sent message" to the sender of PDA messages

* Added span to message
2018-04-14 17:13:52 -04:00
AnturK
66d9a4a0cf Removes /related area variable. (#37173)
* Removes /related area variable.

* area_contents begone

* doorstuff
2018-04-14 12:45:00 +03:00
ShizCalev
8476e6e55e Fixes bad span class for cham projector warning (#37140) 2018-04-13 15:50:16 +03:00
kevinz000
ab993a117a Component Storage, Experimental attack_hand and [ui_]interact() refactors (#36696) 2018-04-12 14:46:14 +03:00
Dennok
a3a439a073 RPD pipe autowrenching (#36417)
* RPD autowrenching

* up

add toggle, remove auto unwrenching
2018-04-12 09:35:55 +12:00
Tad Hardesty
80570931d1 Fix various macro consistency problems (#37092) 2018-04-11 13:20:57 +03:00
iksyp
910eb893b9 The supermatter crystal is now the parent object of the supermatter shard, rather than the other way around (#37025)
*every mention of /obj/item/machinery/power/supermatter_shard in the code should have been replaced with /obj/item/machinery/power/supermatter_crystal and it's variants.
*supermatter shard has been moved to /obj/item/machinery/power/supermatter_crystal/shard
*variable changes like gasefficiency and explosion_power has been switcharood in order to keep it in line with the game as of now
2018-04-11 22:18:49 +12:00
vuonojenmustaturska
ece7de4fb2 Admin borg panel (#36990)
* borgpanel

* wip borg upgrades

* some more

* lockdown

* Update borgopanel.ract

* Update borgopanel.ract

* Update borgpanel.dm

* fuggin borg upgrades :DDD

* more compile, less whatever

* meaningless churn

* and we're done

* usr, vtec

* Update borgopanel.ract

* Update borgpanel.dm

* many squid are cool

* reviews

* coerce to client, much nicer this way

* add admin logging

* review stuff
2018-04-08 11:46:27 -04:00
Tlaltecuhtli
34127e9f8d fixes #34388 by adding cam (#36627)
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
2018-04-06 10:25:59 -04:00
Davidj361
e5d407a1a9 Added cancel button (#36953) 2018-04-06 11:48:02 +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
iksyp
473e18607f implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855)
* loyality

*fixed a bug that made coding relating to loyalty implants basically impossible

* did i say loyalty i meant mindshield

* and the .dme as well

this commit and last were webeditor but it should work
2018-04-02 20:45:03 -04:00
vuonojenmustaturska
27143495c6 Merge pull request #36851 from 81Denton/bs-polycrystal-name
Adds singular_name to BS polycrystals
2018-04-01 15:27:35 +03:00
Jordan Brown
a7f92ae3d9 Merge pull request #36863 from AnturK/unconciousdefine
Prefixes apply_effect flags, fixes unconcious define conflict
2018-04-01 01:15:35 -04:00
AnturK
5ad59da350 Prefixes apply_effect flags, fixes unconcious define conflict 2018-03-31 16:31:11 +02:00
Denton
ea19d80cf5 singular_name 2018-03-31 10:37:08 +02:00
vuonojenmustaturska
28f3a3e354 honk2: electric boogaloo 2018-03-29 22:47:56 +03:00
vuonojenmustaturska
53089a50d1 Fixes chameleon projector memes 2018-03-29 20:50:55 +03:00
kevinz000
e6cbeac2b2 Fixes blueprints exploit (#36625)
* Fixes blueprints exploit

* redundent qdeleted
2018-03-29 11:35:26 +02: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
vuonojenmustaturska
9fb62af5c7 Merge pull request #36731 from fludd12/this-took-too-long-to-fix
Fixes Rainbow Extracts
2018-03-27 23:21:49 +03:00
vuonojenmustaturska
a6c9a2280f Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-27 20:56:39 +03:00
kevinz000
810e5315da Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-27 20:53:06 +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
yorii
3810624cdf Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-27 17:05:23 +03:00
fludd12
5baa1e87e4 Removes an errant comment. 2018-03-26 16:30:40 -04:00
fludd12
daaee7d89c Let's not make it prime several times. That would be bad. 2018-03-26 00:38:18 -04:00
fludd12
663320f2d6 Fixes Rainbow Extracts 2018-03-26 00:32:34 -04:00
Denton
e49d064d3c adds singular_name to BS crystal 2018-03-25 18:40:38 +02:00
Lexorion
9589fe43a1 gives the torch new sprites, fixes missing lines in flashlight.dm 2018-03-24 22:01:03 -05:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Tad Hardesty
69de4fea25 Allow entering frequencies in human-readable form (#36615) 2018-03-22 22:56:05 -04:00
ShizCalev
79b59c5471 Improves some logging legibility 2018-03-21 23:37:00 -04:00
John Ginnane
3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04: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
cyclowns
97aeab66c4 Atmos unary devices can now be analyzed (#36485)
tweak: Unary devices can now be analyzed using gas scanners. This means stuff like vents, scrubbers, cryo tubes, or heaters/freezers.


fixes #36448

this means stuff like cryo, vents, scrubbers, heat exchangers, heaters/freezers, injectors, those big pressure tanks etc. can now be analyzed by gas analyzers/PDA gas scanners
2018-03-21 16:21:40 +13:00
Jordie
9c1731e75b Distinguishes law types by colour (#36463)
* distinguishes law types by colour

* hacked laws now separate from ionic

* fix and less src.

* moves hacked laws above ion

* also the ai fixer

* also missed order in stating laws

* Less garish blue
2018-03-19 20:31:51 -04:00
vuonojenmustaturska
0714b6a4da inquisition ert tweak (#36511) 2018-03-19 20:25:55 -04:00
vuonojenmustaturska
287ee756e8 Adds two new intermediate beaker types to chemistry (#36484)
* a commit

* rebase

* 180
2018-03-19 20:22:32 -04:00
Ian Turk
fbe5f4a062 Replaced body zone magic strings with defines 2018-03-19 15:44:51 -05:00
SailorDave
7f1c8ef88b Crayons and spraycans can no longer infinitely draw large graffiti (#36412)
🆑 SailorDave
fix: Crayons and spraycans can no longer draw an unlimited amount of large graffiti regardless of uses left.
/🆑

Fixes https://github.com/tgstation/tgstation/issues/35833

The check_empty() at the top of the afterattack() was only checking if the can was empty, not if the amount of charges left was less than the spray amount. This is fixed.
2018-03-19 08:07:28 +01: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
vuonojenmustaturska
fa365a5917 Chem dispenser upgrade (#36449)
* Initial commit for chem dispenser update

* ties macro granularity to manipulator level

* rebase
2018-03-17 16:09:23 +01:00
Cruix
7639492389 Added clown ops game mode, and several clown weapons. (#36459) 2018-03-17 02:40:53 -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
kevinz000
4c1284c9d7 Exploit 2018-03-13 20:44:59 -05:00