Commit Graph
1734 Commits
Author SHA1 Message Date
TullyBurnalot c460124da2 Broken-but-On Light fix 2017-01-09 03:25:34 +00:00
Aurorablade 26aee9cb33 i want to see it play live
reverts convert change i want to see it live first
Fixes https://github.com/ParadiseSS13/Paradise/issues/6107
2017-01-07 18:40:03 -05:00
Markolie f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazylemon64 ec0f13d41e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2017-01-06 05:01:43 -08:00
Fox McCloudandGitHub d7bda7b415 Merge pull request #6051 from Crazylemon64/pai_ui_fix
Fixes pAI UIs
2017-01-06 03:08:27 -05:00
Fox McCloudandGitHub 25880eaa22 Merge pull request #6025 from KasparoVy/fixes-ordered-PAs-and-moving-machines
Fixes Cargo-ordered PAs and Wrenching-down Machines in Powered/Powerless Areas
2017-01-01 08:50:41 -05:00
Crazylemon64 f954382619 Adds a ui_key arg to ui_data 2016-12-31 12:51:07 -08:00
KasparoVy c99f6cb0c5 Adds conditions to PA Part changes in power_change()
From feedback.
2016-12-31 15:44:09 -05:00
Markolie 8609157751 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	code/_globalvars/mapping.dm
#	code/game/objects/effects/landmarks.dm
2016-12-30 00:17:56 +01:00
Aurorablade 98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub
# Conflicts:
#	code/game/machinery/doors/airlock.dm
2016-12-29 11:01:43 -05:00
KasparoVy f91b7b3fb6 Guts unnecessary SRCs 2016-12-24 00:50:44 -05:00
KasparoVy b80323f8bc Fixes Cargo-ordered PAs and Wrenching-down Machines in Powered/DePowered Areas
Particle Accelerators will now update with current powernet information
upon being wrenched, just like all other machines. Fixes a bug where PAs
ordered from cargo would never detect parts.

Fixes a bug where machines taken from a depowered area and wrenched into
a powered area wouldn't be powered until you flicked the lights on and
off (or something to that effect).
2016-12-24 00:13:55 -05:00
Markolie 01f2c85347 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2016-12-23 19:32:19 +01:00
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 e134100164 Hunger Rework 2016-11-28 13:17:46 -05:00
Aurorablade 5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
Fox McCloudandGitHub 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
Aurorablade 23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Markolie 6acfd29bd5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate 2016-10-31 14:49:20 +01:00
Fox McCloudandGitHub 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 2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02: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
Aurorablade e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Aurorablade 080c02af87 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-23 00:53:31 -04:00
Aurorablade 335e123643 ever feel like you forgot something? 2016-08-22 03:18:42 -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
Aurorablade 47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
TheDZDandGitHub 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
TheDZDandGitHub 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 McCloudandGitHub f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox
Refactor stack recipes
2016-08-01 20:44:37 -04:00