Commit Graph

590 Commits

Author SHA1 Message Date
Fox McCloud
f2e82da756 Merge pull request #9864 from variableundefined/ManualRevert
Manually revert Purpose's smoothing PR
2018-10-19 19:16:00 -04:00
Mark Mak
91dcf447ec Merge pull request #9888 from Fox-McCloud/spark-refactor
Refactors Spark Spread Activation
2018-10-19 08:41:03 +08:00
Fox McCloud
3825b4e1d5 Refactors Spark Spread Activation 2018-10-17 14:31:07 -04:00
variableundefined
34aadd6b25 Manually revert Purpose's smooth plating PR's smoothing component 2018-10-16 08:57:10 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort
Port over tg ore stack and stack merging
2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +02:00
variableundefined
9a2b530917 Merge pull request #9716 from SamHPurp/smooth-plating
Adds smoothing to plating, add shadows to give depth.
2018-10-09 10:25:34 +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
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
Purpose
c6432d5053 resolving conflicts 2018-10-08 21:09:00 +01: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
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Purpose
c74b0c3ba4 smooooooooth 2018-10-06 13:16:55 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Crazy Lemon
ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle
Port Shuttle to StonedMC
2018-10-01 01:13:42 -07:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
Purpose
037f215d16 updates vars to use the defines 2018-09-16 01:22:57 +01:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
variableundefined
bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
Mars
f2532e74ba Merge conflict fix 2018-08-28 11:28:13 +02:00
Mars
b5b09b435c No hard-coded format in the macros anymore 2018-08-16 11:51:52 +02:00
Mars
e8d92b3ced More flexible macro 2018-08-16 11:37:03 +02:00
Kyep
c1c98e46ef failure messages, depot outgoing redspace portal 2018-08-16 00:57:59 -07:00
Mars
4d3c3b29e4 Quick Regex replace action
Used Regex to replace all hrefs with \ref and the same displayed text
with the corresponding UID macros
2018-08-15 23:57:46 +02:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
62b7f6b55b split jaunter change also 2018-08-02 09:39:00 -07:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Kyep
7a493a5151 neca-inspired loot list adjustments 2018-07-31 17:48:02 -07:00
Crazylemon64
b2d0bb1c0b Fixes maploading so that the cyberiad and space hotel load cleanly again 2018-07-24 20:58:38 -07:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Kyep
3fb7a5e526 Merge remote-tracking branch 'ParadiseSS13/master' into depot 2018-06-28 18:02:48 -07:00
Kyep
4308d658f3 a bunch of fixes & tweaks
jaunters no longer let you escape depot, sentry bot can now be deactivated (for alert increase, via ai console), sentry bot no longer alerts when it get stuck - but does log to debug log, calling red alert with comms console depowered no longer spawns backup, armory door sprites improved, syndi depot beacon never enabled during nukeops, loot table tweaks, removed DM spawner custom icons
2018-06-27 11:34:28 -07:00
Shanewayne9
b6c5c9d3cf coin string fix
from #9106
2018-06-17 18:14:52 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem
# Conflicts:
#	code/__DEFINES/layers.dm
2018-06-13 16:56:19 -04:00
uraniummeltdown
75bded82cf added defines for window construction states and full window diagonal dir
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
2018-06-03 13:11:37 +04:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Fox McCloud
f28285e16f further checks 2018-04-30 04:42:57 -04:00
Fox McCloud
cfe182a1f7 Ports over Timer Subsystem 2018-04-28 20:26:04 -04:00
Crazy Lemon
608a4531ff Merge pull request #8924 from Fox-McCloud/ORM-refactor
ORM Refactor
2018-04-26 14:55:26 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
fa683dd3c1 ORM Refactor 2018-04-25 14:26:51 -04:00