Commit Graph

24456 Commits

Author SHA1 Message Date
vuonojenmustaturska
445e042a42 Merge pull request #35933 from XDTM/LessWikiMoreGame
Operating computers now display required surgery chems
2018-02-25 22:03:59 +02:00
Jordan Brown
397925a3b6 Removes definition redundancy 2018-02-25 13:22:41 -06:00
XDTM
f56d3c35bb Adds limitations to brain traumas (#35938)
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
2018-02-25 18:59:55 +02:00
YPOQ
87e9a2eb53 Fixes gold slime extract reactions runtime (#35936) 2018-02-24 22:59:44 -05:00
ACCount
1b725c1227 Makes new surgeries check for tool qualities (#35847)
* Makes new surgeries check for tool qualities

* Gives augments and autosurgeon some tool_act love

* okay

* Fix duplicate definition
2018-02-24 01:13:04 -05:00
deathride58
56896dfc8e Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)
* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour
2018-02-24 00:46:43 -05:00
Jordan Brown
051aa53834 Merge pull request #35877 from ShizCalev/GAS-METER-LAYER-FIX
Fixes gas meter layering
2018-02-24 00:42:20 -05:00
Jordan Brown
845743c1ce Merge pull request #35912 from ShizCalev/time-cleanup
Cleans up some time stuff with DisplayTimeText
2018-02-24 00:38:16 -05:00
Ashe Higgs
863afe9f9f Adds bastion bourbon and squirt cider (#35892) 2018-02-24 00:05:10 -05:00
vuonojenmustaturska
787366babb Merge pull request #35904 from ShizCalev/mix-sounds
Readds whisky sour & hearty punch mix sounds
2018-02-24 02:51:03 +02:00
XDTM
6293284a90 Operating computers now display required surgery chems. 2018-02-23 21:58:24 +01:00
BordListian
65d8972b8c Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)
* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells
2018-02-23 21:35:11 +02:00
BordListian
6da8820fee Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)
* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one
2018-02-23 21:34:53 +02:00
astralloop
81c6c8e2a3 Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)
* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC
2018-02-23 21:01:35 +02:00
81Denton
14de0fd10d fentanyl (#35882) 2018-02-22 20:39:54 -05:00
Repukan
c6139c1b27 Makes the detective more noir-noire-noided (#35878) 2018-02-22 20:39:16 -05:00
BordListian
0e746319e6 Removes input/output plates and their last remaining use (#35800)
* - Removes input/output plates and their last remaining use

* - ok fine updates the map too

* - loco loco
2018-02-22 20:26:42 -05:00
cebutris
c33c9e06d9 Toxin lovers properly take toxin damage from liver failure (#35901)
* Toxin lovers properly take toxin damage from liver failiure

* Makes it forced instead of checking for toxinlover
2018-02-22 22:43:02 +02:00
ShizCalev
3ab8b52cd3 Cleans up some time stuff with DisplayTimeText 2018-02-22 15:33:45 -05:00
ShizCalev
8f34a2a4d4 Readds whisky sour & hearty punch mix sounds 2018-02-22 12:10:53 -05:00
MetroidLover
67ae3abb29 Updates Ninja welcome text (#35863) 2018-02-21 23:46:50 -05:00
MetroidLover
0cb00e8e2a Ninja event 'fun' change. (#35859)
* Lower 1 hour events to 40mins

* Revert change to Slaughter demon

Waaaaaaaaa

* Revert "Revert change to Slaughter demon"

This reverts commit 92e187338367952ea00ef05b9d2f17d8ff6fb12c.

* Truly revert Slaughter Demon change

Waaaaaa
2018-02-21 23:46:10 -05:00
ShizCalev
a1a718ec4b Fixes gas meter layering 2018-02-21 16:06:17 -05:00
oranges
cbe5d20b9b Merge pull request #35593 from Robustin/marauderfix2
Marauder limit fixed
2018-02-22 09:48:18 +13:00
Repukan
81ff0b6c0e Rebalances Hearty Punch (#35836)
Changed healing rates to be more in par with Atropine but not as weak.
Increased metabolization rate.

balance: Rebalanced healing properties. Metabolization rate upped.

It still allows you to keep on fighting during duress and its combat properties have remained untouched. Also, I think it's an oversight that something with this much alcohol could heal what would be proper ethanol damage suffered from consuming what is a high amount of BAC you'll get from drinking a cocktail like this
2018-02-22 09:29:19 +13:00
oranges
6971ada2a1 Merge pull request #35820 from vuonojenmustaturska/vuonojenmustaturska-patch-2
Remove poisoned apple
2018-02-22 09:15:19 +13:00
Jordan Brown
362276848f Merge pull request #35775 from kevinz000/night_shift
[READY]Randomized Station Time + Night Shifts
2018-02-21 13:01:33 -05:00
AnturK
86f803a749 Fixes patches runtime when applying to missing limbs. (#35845)
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
2018-02-21 12:40:40 -05:00
Jordan Brown
a28b7e64f9 Merge pull request #35842 from 81Denton/meteor-emag-text
Tweaks meteor shield emag text
2018-02-21 12:40:13 -05:00
81Denton
5e4c3c3e9f Changes event earliest_start to use time helpers (#35841)
* uses time helpers, tweaks santa/shuttle loan times

* hourS
2018-02-21 12:38:09 -05:00
81Denton
5e93a1a1a9 Renames various reagent IDs to be more descriptive (#35824)
* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION
2018-02-21 12:36:05 -05:00
ShizCalev
d0f10d151e [s] Cameranet fixes (#35733) 2018-02-21 10:30:27 -03:00
Leo
587259912b Merge pull request #35828 from tgstation/Cyberboss-patch-2
Hopefully fixes gas miners
2018-02-21 10:24:27 -03:00
Leo
313320795a Merge pull request #35825 from tgstation/Cyberboss-patch-1
Revert the notify command not being admin only
2018-02-21 10:24:07 -03:00
Leo
71e8221a77 Merge pull request #35830 from vuonojenmustaturska/clientsignal
Reverts intercept_user_move change for flightsuits
2018-02-21 10:23:37 -03:00
Leo
65e1e2fa88 Merge pull request #35839 from AnturK/take-code-damage
Fixes jugg spell object damage
2018-02-21 10:22:41 -03:00
Leo
2c9f2ffac0 Merge pull request #35837 from AnturK/sensorbadcode
Fixes the sensor corpse runtimes.
2018-02-21 10:22:05 -03:00
kevinz000
8ebc63d2f2 Randomized Station Time + Night Shifts 2018-02-20 21:59:44 -08:00
Jordie
be55b1d3a6 Removes duplicate first death log (#35832)
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
2018-02-20 18:58:25 -06:00
Ordonis
8587f9aab7 Fixes #35814 (#35823)
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
2018-02-20 18:27:55 -05:00
Ashe Higgs
e54ccddec8 Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759)
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
2018-02-20 18:09:59 -05:00
oranges
23d22141ea Merge pull request #35778 from Xhuis/plastic_name
You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names
2018-02-20 23:14:34 +13:00
81Denton
746d02a973 damnit 2018-02-20 11:09:59 +01:00
81Denton
d0b78cc00f crashing this station_goal 2018-02-20 11:06:37 +01:00
AnturK
437859af69 Fixes jugg spell object damage 2018-02-20 09:43:12 +01:00
AnturK
4dd132d7d3 Fixes transit runtime. 2018-02-20 09:23:46 +01:00
AnturK
587811c111 Please read the code you merge. 2018-02-20 09:01:40 +01:00
Trevor Serpas
8b86e3b495 Adds circutry to diagnostic hud, adds action flags to circuits (#35718)
cl
add: Circuits integrity, charge, and overall circuit composition is displayed on diagnostic huds. If the assembly has dangerous circuits then the status icon will display exclamation points, if the assembly can communicate with something far away a wifi icon will appear next to the status icon, and if the circuit can not operate the status icon will display an 'X'.
add: AR interface circuit which can modify the status icon if it is not displaying the exclamation points or the 'X'.
tweak: Locomotive circuits can no longer be added to assemblies that can't use them.
spellcheck: Fixed a typo in the grenade primer description.
code: Added flags to circuits that help group subsets of circuits and regulate them.
/cl

The diagnostic hud addition is meant to allow more counter play to circuits by seeing the assemblies's healths and how dangerous they are. The flags are a useful addition to the code because players shouldn't be able to put circuits in assemblies if the assembly can't use that circuit (this can also be used later for other assemblies which could use unique circuits).

The following circuits are flagged as dangerous:
weapon firing mechanism
grenade primer
thrower

The following circuits are flagged as long range:
NTNet networking circuit
integrated signaler
video camera circuit

possible AR interface displays:
default
alert
move
2018-02-20 14:33:11 +13:00
Jordie
60d6285723 unUpdate death.dm 2018-02-20 10:42:30 +11:00
Jordie
5e5f051282 Update death.dm 2018-02-20 10:39:24 +11:00