Commit Graph

4565 Commits

Author SHA1 Message Date
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes
Gamma ERT Changes
2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
variableundefined
bc4a042d57 Merge pull request #9546 from SamHPurp/oh-come-on,-who-throws-a-baton,-i-mean-really
Thrown Stunbatons have a low chance to stun
2018-10-08 15:06:54 +08:00
Crazylemon64
3db4229918 First big chunk of the refactor
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
2018-10-07 17:52:04 -07:00
Birdtalon
074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Birdtalon
4151487c98 bugfixes 2018-10-07 18:49:48 +01:00
variableundefined
3c98bf5799 Merge pull request #9710 from SamHPurp/de-specifying
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Birdtalon
f877e6b90f adds sprite for T4 2018-10-03 22:20:05 +01:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes
# Conflicts:
#	icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art
Fixes half the server crashing, removes canvases
2018-09-29 07:49:30 +08:00
Birdtalon
deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01:00
nicetoolbox
fdc7297954 Reveal speaker identity when using megaphone 2018-09-27 20:36:13 -07:00
Fox McCloud
c187559e83 Merge pull request #9599 from Agameofscones/lipstickcodefix
Jade lipstick color fix (and minor refactor)
2018-09-27 17:48:15 -04:00
Gwydion Brain
d426ed1879 Adds comments and loadout 2018-09-27 14:17:32 -07:00
tigercat2000
59fba23456 Merge pull request #9524 from alex-gh/autopsy_time_fix
Autopsy scanner now prints all times in human readable format.
2018-09-26 21:36:23 -07:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen
Mixing Bowls and Kitchen refactors
2018-09-26 17:32:39 -07:00
Crazy Lemon
ae68d43d46 Merge pull request #9032 from Anasari/CabinetDecon
Allow you to construct & deconstruct fire extinguisher cabinet
2018-09-26 17:31:15 -07:00
Crazy Lemon
f863b792bd Merge pull request #9601 from variableundefined/DropLocation
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
Crazy Lemon
d3505ea9b9 Merge pull request #9543 from nicetoolbox/changeling-grab-fix
Fix changeling tentacle grab
2018-09-26 16:25:25 -07:00
Gwydion Brain
3e4c7b476b I have no idea how this works 2018-09-24 23:06:21 -07:00
Dedhia
524fdef17b General Fix 2018-09-24 20:36:17 -07:00
Dedhia
f68cf60f58 Fixes #9607 2018-09-24 15:16:16 -07:00
variableundefined
a499b0fc68 Paving the path for a bigger inventory refactor 2018-09-23 22:26:10 +08:00
Gwydion Brain
74ffb9bbdb Refactors lipstick
New variable [stickprefix] so RGB codes can be called on all color variants
2018-09-23 01:37:09 -07:00
Gwydion Brain
f0b2c596e1 Initial
Fixes jade lipstick being lime. Adds lime lipstick.
2018-09-22 21:39:14 -07:00
Birdtalon
55fa8bb5bd tidying up 2018-09-22 15:53:37 +01:00
Birdtalon
eb312f526f gamma fireproof suits, fixed an accidental removal in scanners.dm 2018-09-22 15:11:19 +01:00
Birdtalon
d35155baec Merge branch 'master' into ERT-gun
# Conflicts:
#	code/modules/response_team/ert_outfits.dm
2018-09-22 14:04:35 +01:00
Birdtalon
424f3ac200 changes to ERT equipment datums, organises some files a little clearer 2018-09-22 14:00:41 +01:00
Birdtalon
5dff419518 adds T4 thermite charge, alters thermitemelt() slightly to add speed parameter 2018-09-20 21:45:45 +01:00
Birdtalon
9eea8fa4cd finishing touches to scanner
corrections to update_icon

updating icons, charging the analyser, power consumption tweaks
2018-09-20 21:45:43 +01:00
Birdtalon
0a83572294 adds scanner icons
adds more code for ERT scanner

ert scanner
2018-09-20 21:45:28 +01:00
nicetoolbox
385f290bc3 Clean up some grabs 2018-09-16 12:28:39 -07:00
Purpose
81b19833ee RNG give me strength 2018-09-15 20:45:26 +01:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
Ty-Omaha
28acdb1e56 removes canvases 2
fully removes it as per tiger's critique
2018-09-12 02:40:32 -04:00
alex-gh
b59aa8cb75 Autopsy scanner now prints all times in human readable format. 2018-09-11 17:39:05 +02:00
Fox McCloud
6832dbe74e Merge pull request #9373 from variableundefined/walletdecal
Wallet icon defaults to green if it is filled with an id of any type
2018-09-09 18:09:56 -04:00
Crazy Lemon
847ef225d0 Merge pull request #9479 from datlo/megaphonevoicefix
Fixes #8439, adds font check to the megaphone
2018-09-04 10:22:42 -07:00
Crazy Lemon
7f86521753 Merge pull request #9283 from Aurorablade/PlasmaIsGrifingMe
Adds some Logging to some items
2018-09-04 09:23:11 -07:00
Crazy Lemon
5f11e5945e Merge pull request #9367 from TDSSS/hypospray-belt
Allows medical belts to hold hyposprays
2018-09-04 09:21:37 -07:00
datlo
5c3aeef45e replace locate check 2018-09-04 11:47:15 +01:00
datlo
0418e51a21 Adds font check to the megaphone
Megaphone now carries over the user's font (wingdings, comic sans, and
any other font in mind.speech_span)
2018-09-03 16:32:20 +01:00