Commit Graph

912 Commits

Author SHA1 Message Date
Markolie
84c8b2e12b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
# Conflicts:
#	code/game/machinery/computer/camera.dm
2016-12-23 18:58:58 +01:00
Tigercat2000
b9abce843d NanoUI Update: Seperate UI Data into ui_data() proc
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.

To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Fox McCloud
1e47d33d65 Merge pull request #5852 from Markolie/grammarnazi
PA wording fixes
2016-11-06 12:04:06 -05:00
Markolie
b77da4511e PA wording fixes 2016-11-06 16:44:54 +01:00
Markolie
6acfd29bd5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate 2016-10-31 14:49:20 +01:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul
Ports over the status effect unification from the extreme refactor
2016-10-30 22:40:24 -04:00
Crazylemon64
8a6db8891f Fox's requests 2016-10-23 15:45:35 -07:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
dc57019568 Better admin observer checking 2016-10-23 15:30:35 +02:00
Markolie
8b541bb1e9 Hopefully final TEG fixes 2016-10-13 19:40:16 +02:00
Markolie
61e1ae0f03 Further TEG changes 2016-10-12 14:49:58 +02:00
Markolie
c4f7730764 Additional TEG changes 2016-10-12 14:00:02 +02:00
Markolie
a577cd206c TEG refactor 2016-10-11 22:49:51 +02:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
FalseIncarnate
e939f6b591 Delays and Welder Repair Tweaks
Welders now consume 1 fuel to heal 15 points of brute damage when
repairing robotic limbs / IPCs

Welders must now be ON to repair robotic limbs / IPCs (seriously, who
dropped the ball on this one?)

Welders and Cable Coils now incur a 1 second delay when being used to
self-repair robotic limbs / IPCs
- This is HALF the delay organics have to suffer when using trauma kits,
and rather easy to not even notice.
2016-08-19 21:34:39 -04:00
FalseIncarnate
80ad643ddc Robotic Limb Repair now consumes cables
Repairing burn damage on a robotic limb / IPC now consumes cables in the
process.

The heal ratio is 3 burn damage per length of cable. Repairing will cap
at 15 damage (5 cables) per use, which is the amount that was previously
healed with every use. If you have less than 15 damage, it will use the
number of cables necessary to fully repair the damage. If you have fewer
than 5 cables, it will attempt to repair as much damage as possible with
the amount provided.

A full cable coil (30 lengths) will now heal a total of 90 burn damage,
instead of being an infinite healing source as long as you have at least
one piece. This makes cable coils more comparable to the advanced burn
kits in medical for organic patients, which have only 6 uses that always
heal 25 damage.

Technically a balance PR, but also can be considered an exploit fix
since robotic limbs literally had pocket-sized infinite healing sources
readily available across maint while organic limbs didn't have that
luxury.
2016-08-18 17:08:36 -04:00
TheDZD
e944f176d6 Merge pull request #5418 from Fox-McCloud/malf-ai-rework
Malf AI Rework
2016-08-12 18:30:41 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
eee7b57099 fix 2016-08-11 06:15:28 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time!
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
2016-08-07 23:42:02 -07:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
Fox-McCloud
15d7d16ec8 oops 2016-08-03 22:34:29 -04:00
Krausus
ea0f5b9802 Ports typecaches and their use in the tesla 2016-08-03 20:08:51 -04:00
Fox-McCloud
5533c36af3 Field Generator Cleanup, Singularity Fixes, 2016-08-03 17:17:04 -04:00
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07:00
Fox McCloud
f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox
Refactor stack recipes
2016-08-01 20:44:37 -04:00
TheDZD
e35bbc4ac3 Merge pull request #5279 from Fox-McCloud/more-tweaks-to-stuff
More Overload Lighting Performance
2016-08-01 20:27:29 -04:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Fox-McCloud
62a780220d More Overload Lighting Performance 2016-08-01 15:29:47 -04:00
TheDZD
13d2c6c677 sound lag fixes 2016-08-01 14:10:09 -04:00
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07:00
Tigercat2000
221476ef3b Refactor stack recipes
- Styling fixes
 - Added post_build() to stack recipes, for any recipes that need to do
   something special
   - Called with two arguments, the stack that it originated from, and the
     new object.
 - Moved stack recipes to their own file

Currently, only two things use post_build
 - Cablecuffs use it to color the cuffs the same as the wire they
   originated from
 - Metal rods use it to call update_icon, in order to display the correct
   sprite for whatever amount of rods you created.
2016-07-31 07:20:26 -07:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
TheDZD
629caa47f8 Merge pull request #5165 from Fox-McCloud/alt-click-madness
Alt Click Madness
2016-07-26 14:08:21 -04:00
Fox-McCloud
0870c66303 tweak 2016-07-26 14:02:07 -04:00
Fox-McCloud
8a2e78c323 Removes Cablecuffs... 2016-07-22 22:58:50 -04:00
Fox-McCloud
d83fe43331 tweak 2016-07-22 19:25:07 -04:00
Fox-McCloud
451044863e Alt Click Madness 2016-07-22 16:09:16 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Crazylemon64
a44808f195 Final map tweaks 2016-07-03 17:17:56 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00