Commit Graph
4623 Commits
Author SHA1 Message Date
Mark MakandGitHub b418ee8401 Merge pull request #9828 from datlo/honkinfiltrationkit
Adds the Honk Brand Infiltration Kit
2018-10-17 21:35:06 +08:00
Mark MakandGitHub a89f886a37 Merge pull request #9858 from Ty-Omaha/stunbaton-runtime
Fixes stunbaton runtime
2018-10-15 13:17:30 +08:00
Ty-Omaha 2862503d2b stunbaton runtime comment 2018-10-15 01:01:39 -04:00
Ty-Omaha adbf0bb2cc stunbaton runtime fix 2018-10-15 00:54:17 -04:00
Gwydion Brain d7ecb3bd8c Typo 2018-10-14 21:12:42 -07:00
Gwydion Brain 812c142fe9 Lil fixo 2018-10-14 21:06:37 -07:00
Gwydion Brain 09313bbea1 Initial 2018-10-14 21:04:12 -07:00
Purpose 621a2a7f9d bed time 2018-10-15 00:47:13 +01:00
Purpose d11a0ac95b visibility 2018-10-14 11:52:09 +01:00
variableundefined 747684927a Formatting fixes & spanning fish tank 2018-10-13 22:12:37 +08:00
variableundefined 65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Mars 984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
datlo ac5cc480b9 Adds the Honk Brand Infiltration Kit
Also adds the clown mask voice changer as part of the kit
2018-10-12 17:02:55 +01:00
variableundefined 569f68b128 Merge branch 'master' into RelPath 2018-10-12 14:08:19 +08:00
variableundefinedandGitHub 376cdc709a Merge pull request #9818 from farie82/twohanded-fix
Fixes the giving of required two handed items and chainsaw stuf
2018-10-12 13:24:19 +08:00
variableundefinedandGitHub 4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000andGitHub 98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
joep van der velden c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
variableundefined 309e3b04f6 Clears up some relative pathing part 1 2018-10-10 23:39:34 +08:00
lass9030 8111331094 Replaced code with procs, added return values. 2018-10-09 16:21:11 +02:00
Mars d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02: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
variableundefinedandGitHub 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
variableundefinedandGitHub 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
variableundefinedandGitHub 3c98bf5799 Merge pull request #9710 from SamHPurp/de-specifying
Reduces incorrect use of station names.
2018-10-07 22:52:27 +08: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
Desolate c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Birdtalon 1628467857 Merge branch 'master' into ERT-changes
# Conflicts:
#	icons/mob/head.dmi
2018-09-30 14:53:32 +01:00
PurposeandGitHub c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
Fox McCloudandGitHub 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
Crazy LemonandGitHub f863b792bd Merge pull request #9601 from variableundefined/DropLocation
Adds in drop_location & AllowDrop()
2018-09-26 17:00:11 -07:00
Crazy LemonandGitHub 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 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 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
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