cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 01:51:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,914 Commits 26 Branches 2 Tags
332deb840e6d8976c02786dfcd97f2c4ccb113ab
Commit Graph

950 Commits

Author SHA1 Message Date
Markolie
1d7de41acb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/pooling/pool.dm
 2017-01-27 17:28:14 +01:00
FalseIncarnate
8ee22e320a logging changes 
as requested by mark
 2017-01-25 23:44:27 -05:00
FalseIncarnate
a4037ad426 Rigging Lights and Cells now works with Plasma Dust 
Light bulbs, light tubes, and power cells can now be rigged with plasma
dust from grinding plasma sheets as well as the standard plasma reagent
from a chem dispenser. Both reagents require at least 5u of the reagent
to be injected at once to rig the bulb/tube/cell to explode.

If a rigged cell is inserted into a stunprod, it only explodes when you
actually attempt to stun something with it, not when you turn the prod
on. This was unchanged, but I'm mentioning it so people don't think I
changed that.

Fixes #6238

🆑
tweak: Plasma dust can now be used to rig lights and power cells, like
the plasma reagent, with explosive results.
/🆑
 2017-01-24 19:47:18 -05:00
Markolie
a50a3d59b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/__DEFINES/is_helpers.dm
#	code/_globalvars/lists/objects.dm
#	code/game/machinery/turrets.dm
#	config/example/config.txt
#	goon/browserassets/css/browserOutput.css
#	icons/obj/library.dmi
#	icons/turf/floors.dmi
 2017-01-20 23:43:35 +01:00
Crazy Lemon
c16397af3f Merge pull request #6145 from AndriiYukhymchak/teg_reworks 
TEG's circulators can now be controlled
 2017-01-18 19:04:10 -08:00
Andrii Yukhymchak
6d3eb11adb Naming and using updated 2017-01-15 19:48:14 +02:00
Fox McCloud
b993295e60 Merge pull request #6120 from TullyBurnalot/OverOverload 
Multiple Ascendant Light Fix
 2017-01-15 12:44:47 -05:00
TullyBurnalot
f7b729c138 ACTUALLY addresses suggestion by Krausus 2017-01-15 17:37:30 +00:00
TullyBurnalot
86536e3b43 Removes needless proc 2017-01-15 14:35:00 +00:00
TullyBurnalot
d2210f24c5 Re-adds skip_sounds_and_sparks 
Woops, forgot how useful this could be
 2017-01-15 14:25:05 +00:00
TullyBurnalot
2d82f940f6 Addresses suggestion by Krausus/Syntax fix 2017-01-15 14:20:15 +00:00
Markolie
0c01bbdad1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/game/gamemodes/cult/runes.dm
 2017-01-12 16:24:26 +01:00
Aurorablade
5a07759c97 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Bugsie 2017-01-11 23:41:06 -05:00
Markolie
f85e8fe551 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi
 2017-01-11 23:11:29 +01:00
Andrii Yukhymchak
f758d1f26d TEG pipeside swap 2017-01-11 10:46:30 +02:00
Crazy Lemon
f1c3a7cd13 Merge pull request #6085 from Fox-McCloud/food-rework 
Food rework
 2017-01-10 12:11:17 -08:00
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 McCloud
d7bda7b415 Merge pull request #6051 from Crazylemon64/pai_ui_fix 
Fixes pAI UIs
 2017-01-06 03:08:27 -05:00
Fox McCloud
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 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
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 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
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