Commit Graph

3623 Commits

Author SHA1 Message Date
LetterJay
78bc5ed7ef Merge pull request #6173 from Citadel-Station-13/upstream-merge-36772
[MIRROR] Removes derpartment
2018-03-31 06:22:11 -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
e35ddc7093 Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723
[MIRROR] Corrects plasma window armor inconsistency
2018-03-31 06:18:48 -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
9520546277 Merge pull request #36772 from vuonojenmustaturska/dertpartment
Removes derpartment
2018-03-29 08:34:02 -05:00
kevinz000
9442a2905e Fixes blueprints exploit (#36625)
* Fixes blueprints exploit

* redundent qdeleted
2018-03-29 04:35:09 -05:00
RandomMarine
d7cd4726a2 Fixes plasma window fire armor 2018-03-28 13:37:53 -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
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
deathride58
e6c16ba8f8 Merge pull request #6129 from Citadel-Station-13/upstream-merge-36597
[MIRROR] Security records consoles now uploads the center 32x32 of a photo when putting photos in
2018-03-27 17:51:17 +00:00
deathride58
aa415031a0 Merge pull request #6125 from Citadel-Station-13/upstream-merge-36671
[MIRROR] Fixes machines not updating power when changing areas
2018-03-27 17:49:35 +00:00
deathride58
be9ae841b6 Merge pull request #6123 from Citadel-Station-13/upstream-merge-36716
[MIRROR] Adds singular_name to BS crystals
2018-03-27 17:48:51 +00:00
deathride58
ebc51d94bf Merge pull request #6119 from Citadel-Station-13/upstream-merge-36398
[MIRROR] [READY]pathfinding circuitry upgrade
2018-03-27 17:47:11 +00:00
deathride58
87600c4ff4 Merge pull request #6118 from Citadel-Station-13/upstream-merge-36509
[MIRROR] [READY]recycler buff
2018-03-27 17:46:23 +00:00
deathride58
85a621f717 Merge pull request #6113 from Citadel-Station-13/upstream-merge-36695
[MIRROR] Fixes consoles
2018-03-27 17:45:35 +00:00
deathride58
15472805ba Merge pull request #6055 from Poojawa/cmo-hypo-objective
Removes the old hypospray from CMO closet, updates tator objective
2018-03-27 17:41:44 +00:00
kevinz000
40776d5ee5 Security records consoles now uploads the center 32x32 of a photo when putting photos in (#36597)
* Sec console centering photos

* Update security.dm

* whoever coded this before me is triple meme
2018-03-26 21:04:48 -05:00
Jordan Brown
ed6fae603e Merge pull request #36671 from YPOQ/areachangepowerfix
Fixes machines not updating power when changing areas
2018-03-26 14:25: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
arsserpentarium
303272319a [READY]pathfinding circuitry upgrade (#36398)
* all in one

* fixfixfix

* uhhhh

* demuxdemuxdemuxdemux

* wire eriw

* icon noci

* tihsxifixshit

* rewopower

* fixif

* screeneercs

* returnruter
2018-03-26 11:01:22 -05:00
arsserpentarium
febcc648af [READY]recycler buff (#36509)
* recycler

* runtimemitnur

* mkay
2018-03-26 10:54:04 -05:00
Poojawa
34718e35cd Update medical.dm 2018-03-26 04:32:36 -05:00
CitadelStationBot
de697be536 [MIRROR] Fix unwrenching and placing directional signs (#6106)
* Fix unwrenching and placing directional signs

* Merge pull request #36677 from AutomaticFrenzy/patch/sign-backings

Fix unwrenching and placing directional signs
2018-03-26 04:30:33 -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
bb1aaf01e7 [MIRROR] Plastic flaps are now airtight (#6098)
* Plastic flaps are now airtight (#36659)

* flaps

* fucking flaps, how do they work?

* Plastic flaps are now airtight
2018-03-26 04:20:12 -05:00
CitadelStationBot
4f254f181f [MIRROR] Sintouched antag datums (#6096)
* Sintouched antag datums (#36561)

* Sintouched stuff

* hudz

* These are boring and when they happen they happen en masse so let's just list them

* undefs

* Sintouched antag datums
2018-03-26 04:19:49 -05:00
oranges
3a93b7e75a Fixes consoles 2018-03-26 02:30:18 -05:00
CitadelStationBot
3e25c34dbc [MIRROR] Turret's process() is now 52% more efficient (#6107)
* Turret's process() is now 52% more efficient

* Turret's process() is now 52% more efficient (#36662)

* 52% more efficient process()

* Less unecessary popdown calls

* webediting
2018-03-25 20:22:55 -07:00
CitadelStationBot
b02180de44 [MIRROR] fixes airlock audio inconsistency (#6068)
* fixes airlock audio inconsistency (#36574)

* fixes inconsistency

* replaces sound

* src

* fixes airlock audio inconsistency
2018-03-22 06:11:42 -05:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00
CitadelStationBot
30e5e7a56a [MIRROR] Fixes regression with pulled objects and space transitions (#6065)
* Fixes regression with pulled objects and space transitions (#36587)

* Fixes spesspulling

* honk

* Fixes regression with pulled objects and space transitions
2018-03-22 06:09:55 -05:00
CitadelStationBot
c8c7e6575b [MIRROR] fixes "Xeno acid melts lava" (#6063)
* fixes "Xeno acid melts lava" (#36584)

* fix

* im dumb

* fixes "Xeno acid melts lava"
2018-03-22 06:08:51 -05:00
CitadelStationBot
738df3f400 [MIRROR] fixes breaking SSUs (#6057)
* fixes breaking SSUs (#36577)

* fixes breaking SSUs
2018-03-22 06:06:21 -05:00
Poojawa
e52e52fa5d Removes the old hypospray from CMO closet, updates tator objective 2018-03-21 20:37:29 -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
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
2018-03-19 21:25:01 -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
fcbc76a7a9 [MIRROR] Pacifists can now use mech drills on closets containing living beings (#6020)
* Pacifists can now use mech drills on closets containing living beings

* Removes no longer needed Mecha code relating to Pacifist use of drills. Also alters variables to be more consistent. (#36494)
2018-03-19 21:16:44 -05:00
CitadelStationBot
889ff6fa08 [MIRROR] circuit diagnostic status icon changes (#6019)
* circuit diagnostic status icon changes

* circuit diagnostic status icon changes (#36218)

* circuit diagnostic hud revisit

warning icon replaced with red versions of prefered icons, new icons added to the AR interface

* did this fix it?

* ok how about now

put all the new icons at the end of the file instead of at different places inside
2018-03-19 21:16:26 -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