Commit Graph

1203 Commits

Author SHA1 Message Date
iksyp
e8698ab798 Gives beer and soda dispensers their own circuitboards and Design ID's (#37315)
* new boards

* new boards installed

* new designs (wow) (woah)

* added the new design ids to the biotech node

* tested

it works, also, that typo fucking stopped it from compiling
2018-04-22 19:19:51 -05:00
LetterJay
68a1d541b1 Merge pull request #6441 from Citadel-Station-13/upstream-merge-37223
[MIRROR] Fixes some defines and value
2018-04-22 02:43:26 -05:00
LetterJay
d0db0f0c85 Merge pull request #6436 from Citadel-Station-13/upstream-merge-37141
[MIRROR] Repeat of "I don't recall an arcade machine being th... GLORF (Chameleon Projector Change)"
2018-04-22 02:41:57 -05:00
PKPenguin321
ddb6f7ebae 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 19:20:26 -05:00
AnturK
31efa96a01 Fixes some defines. (#37223) 2018-04-16 08:32:48 -05:00
Grandmother of 50
0fca7cf7f0 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 04:39:57 -05:00
John Ginnane
d63b549302 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 16:13:50 -05:00
deathride58
6923c83762 Merge pull request #6377 from Citadel-Station-13/upstream-merge-36417
[MIRROR] RPD pipe autowrenching
2018-04-14 20:37:42 +00:00
ShizCalev
38b2460760 Fixes bad span class for cham projector warning (#37140) 2018-04-13 07:49:54 -05:00
Dennok
105e55068b RPD pipe autowrenching (#36417)
* RPD autowrenching

* up

add toggle, remove auto unwrenching
2018-04-11 16:36:56 -05:00
deathride58
5669e6a0a1 Merge branch 'master' into upstream-merge-36953 2018-04-10 07:21:55 +00:00
deathride58
87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58
e54029a382 Update stack.dm 2018-04-06 20:51:39 -04:00
Tlaltecuhtli
4f7d35ec4f 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 09:24:47 -05:00
Davidj361
1164cec64d Stack Sheets Cancel Button 2018-04-06 03:46:47 -05:00
John Ginnane
80fee95dab 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-03 22:02:39 -05:00
deathride58
edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
2018-04-03 08:16:11 +00:00
iksyp
496f73bc56 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 19:46:01 -05:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
vuonojenmustaturska
76a9540f80 Merge pull request #36851 from 81Denton/bs-polycrystal-name
Adds singular_name to BS polycrystals
2018-04-01 07:27:45 -05:00
LetterJay
c19f285322 Merge pull request #6179 from Citadel-Station-13/upstream-merge-36807
[MIRROR] Fixes some edge cases with chameleon projectors and sleepers
2018-04-01 01:03:10 -05:00
LetterJay
05e85ddfb0 Merge pull request #6168 from Citadel-Station-13/upstream-merge-36625
[MIRROR] Fixes blueprints exploit
2018-03-31 06:21:14 -05:00
LetterJay
71af2a9bc5 Merge pull request #6154 from Citadel-Station-13/upstream-merge-36477
[MIRROR] Science goggles detect grenade reagents
2018-03-31 06:17:37 -05:00
LetterJay
d509014cd3 Merge pull request #6151 from Citadel-Station-13/upstream-merge-36655
[MIRROR] Fixes hot potato coloration
2018-03-31 06:17:22 -05:00
LetterJay
9cf0b857db Merge pull request #6150 from Citadel-Station-13/upstream-merge-36617
[MIRROR] Improves some logging legibility
2018-03-31 06:17:11 -05:00
Jordan Brown
675b5570b8 Merge pull request #36807 from vuonojenmustaturska/champrojectoragain
Fixes some edge cases with chameleon projectors and sleepers
2018-03-31 06:13:00 -05:00
kevinz000
9442a2905e Fixes blueprints exploit (#36625)
* Fixes blueprints exploit

* redundent qdeleted
2018-03-29 04:35:09 -05:00
yorii
130337797d Science goggles detect grenade reagents (#36477)
* Science goggles detect grenade reagents

* reversed output

* minor improvements

* new helper for counting stuff

* spelling fixes
2018-03-28 12:18:18 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
kevinz000
8c98e4769c Fixes hot potato coloration (#36655)
* Fixes hot potato coloration

* wupps
2018-03-28 12:17:45 -05:00
vuonojenmustaturska
adf4786470 Merge pull request #36617 from ShizCalev/logging-cleanup
Improves some logging legibility
2018-03-28 12:17:32 -05:00
Ashe Higgs
8ec16df2e4 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 12:15:06 -05:00
Jordan Brown
35f0fe9676 Merge pull request #36716 from 81Denton/bscrystalname
Adds singular_name to BS crystals
2018-03-26 14:21:36 -05:00
CitadelStationBot
9f5682fa35 [MIRROR] New torch sprites, fixed missing inhands (#6099)
* New torch sprites, fixed missing inhands

* missing sprites
2018-03-26 04:27:30 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
CitadelStationBot
2fbdfd1856 [MIRROR] Atmos unary devices can now be analyzed (#6037)
* 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

* Atmos unary devices can now be analyzed
2018-03-21 12:58:24 -05:00
deathride58
9517e3ad2e Merge pull request #5990 from Poojawa/digileg-runtime
Hopefully crushes some runtimes
2018-03-20 15:26:43 +00:00
CitadelStationBot
9f182d89ed [MIRROR] Distinguishes law types by colour (#6022)
* Distinguishes law types by colour

* merge conflict
2018-03-19 22:17:24 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBot
dad2d44ea2 [MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)
* [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.

* [READY] Several fixes/changes to mood, longterm mood effects, beauty component
2018-03-19 21:33:18 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00
CitadelStationBot
b74454bf5c [MIRROR] Tweaks to ERT creation (#6021)
* inquisition ert tweak (#36511)

* Tweaks to ERT creation
2018-03-19 21:18:02 -05:00
CitadelStationBot
c8004a088e [MIRROR] Crayons and spraycans can no longer infinitely draw large graffiti (#6001)
* 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.

* Crayons and spraycans can no longer infinitely draw large graffiti
2018-03-19 21:16:00 -05:00
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes
cleans up some dogborg sleeper code too
2018-03-17 19:38:03 -05:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459
[MIRROR] Clown Ops
2018-03-17 23:58:15 +00:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449
[MIRROR] Chem dispenser upgrade
2018-03-17 23:55:32 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00