cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-16 00:26:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
1734 Commits
Author SHA1 Message Date
ZuhayrandZomgPonies a80c317cbe More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. 
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/supplyshuttle.dm
 2014-06-15 07:58:00 -04:00
ZuhayrandZomgPonies 31a1b6e526 Fixes #5098 
Conflicts:
	code/game/objects/items/weapons/tools.dm
	code/modules/power/cable.dm
 2014-06-01 13:29:18 -04:00
ZomgPonies 5f67943f8e Revert "APC bugfix after someone messed with mah areas!" 
This reverts commit ceca0ddbe8.
 2014-05-27 21:22:53 -04:00
Ccomp5950andZomgPonies ceca0ddbe8 APC bugfix after someone messed with mah areas! 
This was probably bound to happen either way the previous version was based upon a faulty understanding of how the areas worked this is much more robust and only messes with the master areas
and master areas needing power updates call power updates for the each of it's child areas.  Also added where messing with SMESes called for an update on all areas power consumption, probably
not required but doing so either way.

We also rebuild the active_areas list every 5 minutes, if you get a engineer that wants to build a new area off of the station with APC's set rebuild_all_areas in the master controller and it will
update instantly, otherwise wait 5 minutes.  The only downside to this 5 minutes is you might get free energy until that area becomes active.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/power/apc.dm
 2014-05-27 00:28:31 -04:00
mwerezakandZomgPonies 418ba281d7 Fixes circuit var for other consoles 
Also cleans up attackby while we're at it.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/computer/arcade.dm
	code/game/supplyshuttle.dm
	code/modules/mining/mine_items.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/research_shuttle.dm
	code/modules/research/server.dm
 2014-05-26 06:21:03 -04:00
Mloc-Argentandalex-gh 1b2f83dee4 BS12 Hooks 2014-05-22 23:56:35 +02:00
ZomgPonies b4908b5d5c Tied gravity to the actual grav generator 2014-05-20 16:33:07 -04:00
UristMcKermanandZomgPonies 93a4cf5317 Quick fix to TEG 
When one of TEG circulator intakes had gas while the other had no (null)
the air in the first used to be deleted. Fixed this behavior.
 2014-05-20 16:04:23 -04:00
ESwordTheCatandZomgPonies a6ee8dc678 Revert gun pool for now. 
Conflicts:
	code/game/machinery/turrets.dm
	code/modules/projectiles/projectile/beams.dm
 2014-05-19 19:34:20 -04:00
ZuhayrandZomgPonies e1bfc3cfe0 Allowed magnetic grippers to remove APC cells. 
Conflicts:
	code/modules/power/apc.dm
 2014-05-12 04:38:08 -04:00
ZuhayrandZomgPonies 450beac5a9 Fixes a runtime with drones building lights. 2014-05-12 03:03:37 -04:00
ZuhayrandZomgPonies d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
 2014-05-12 01:41:02 -04:00
GiacomandandZomgPonies d147e97ca0 You can now walk behind the three top parts of the gravity generator, to be able to fix a space breach in the middle of it. 
Conflicts:
	code/modules/power/gravitygenerator.dm
 2014-05-07 16:18:22 -04:00
ZomgPonies 48aea00e33 Grav generator, not mapped in yet 2014-05-05 03:03:22 -04:00
ZuhayrandZomgPonies 31e95baa78 Fixes for previous commit, sigh. 2014-05-03 17:38:01 -04:00
ZuhayrandZomgPonies 75d8633fbe Adding some repair procs to cables and welders for IPC use. 
Conflicts:
	code/modules/power/cable.dm
 2014-05-03 17:37:46 -04:00
ZomgPonies fdd1d94769 Hopefully fix solars for realsies 2014-05-01 21:49:24 -04:00
ESwordTheCatandZomgPonies ebfcc9be79 Object pool for beam projectile, minor changes to object pool. 
Conflicts:
	code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	code/game/objects/structures/grille.dm
	code/modules/power/singularity/emitter.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
 2014-04-29 13:33:06 -04:00
ZomgPonies 1ebe9f34e9 Solar fixes 2014-04-27 17:39:56 -04:00
ZomgPonies 1cdbe818ad tg's solars update 2014-04-22 09:46:36 -04:00
ESwordTheCatandZomgPonies 16d5d18e7c Revert from area to text. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:37:00 -04:00
ESwordTheCatandZomgPonies 84c296e741 Use the experimental getArea. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:28:46 -04:00
ESwordTheCatandZomgPonies b332bc7dec Don't use get_area proc, introduce myArea variable. 
Conflicts:
	code/modules/power/power.dm
 2014-04-20 03:26:59 -04:00
ESwordTheCatandZomgPonies c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
Ccomp5950andZomgPonies 90ff395199 Lagsie no more, NarSie HUNGERS 
removed del() calls for objects, now it sets loc to null and removes it from master_controller processing

Much quicker :)

Conflicts:
	code/modules/power/singularity/singularity.dm
 2014-04-19 15:48:48 -04:00
alex-gh 369c894173 Fixed crash when hacking vending machines on clown planet 2014-04-09 01:33:43 +02:00
alex-gh cfbfa0e993 Smoke rework caused endless loops, reverted. 2014-04-08 01:47:56 +02:00
alex-gh 521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Ccomp5950andalex-gh ed69c23e07 Bugfix for new APC code, gridchecks won't just turn off equipment. 
Was a problem with me switching the order of the checks.

Conflicts:
	code/modules/power/apc.dm
 2014-04-03 21:37:43 +02:00
Chinskyandalex-gh 7f4388c5a3 Cleaned the fuck out of smoke. 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/organs/organ_external.dm
 2014-04-03 18:18:04 +02:00
Rob NelsonandZomgPonies 5c8ddf2a31 YOOOOO0U. YOU GOT WHAT AH NEEEEEEEED 
Conflicts:
	code/__HELPERS/game.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/firedoor.dm
	code/modules/client/preferences_toggles.dm
	code/setup.dm
	maps/tgstation.2.1.0.0.1.dmm
 2014-03-11 02:28:58 -04:00
DJSnapshotandZomgPonies e6eae0fdb1 quick fix for APCs related to IPC charging. 2014-03-10 23:03:36 -04:00
Rob NelsonandZomgPonies a9f67bf557 EMERGENCY FIX FOR SINGULO NOT WORKING 2014-03-10 18:45:03 -04:00
d3athrowandZomgPonies 29be5b8f7e More anti-griff logging thanks to intigracy's mania 2014-03-10 07:03:40 -04:00
Ccomp5950andZomgPonies bb61c6ef27 Bugfix: All APC's will have maxcharge of 5,000 
and not be at the whim of lag / how quickly it generates it's cell.
 2014-03-08 17:04:03 -05:00
Ccomp5950andZomgPonies 54f7bc0701 Removed my debug lines. 2014-03-08 17:03:46 -05:00
Ccomp5950andZomgPonies e7d4f4ad4b Effeciency Project: APC / Machinery power usage. 
We no longer run auto_use_power() on every machine every tick.
We now have a global list of areas, and areas that have an APC in them (all_areas and active_areas) no more looping through world bullshit.
A bunch of snowflakey as fuck machines won't use_power() in their process, you get two options, active and idle, use them!
This means a lot of machines won't double dip on power as well so power usage for the station has dropped about 20%

Because everything is snowflakey as fuck we're going to have some machines that don't force an update on their power usage.  Fuck them.
We should catch them with the root obj/machine/proc's forcing updates.

Conflicts:
	code/modules/mob/mob.dm
	code/modules/power/apc.dm
 2014-03-08 17:03:29 -05:00
Ccomp5950andZomgPonies b97434054f APC Area update initial commit. 
Conflicts:
	code/modules/mob/mob.dm
	code/modules/power/power.dm
 2014-03-08 17:00:43 -05:00
ZomgPonies 16ea3bde04 Compile fixes 2014-03-05 20:37:02 -05:00
d3athrowandZomgPonies 977addd8fb merge MrPerson's qdel fixes 2014-03-05 20:30:56 -05:00
d3athrowandZomgPonies 4f168d8caf qdel and Destroy() improvements, now done through objects/items/devices 2014-03-05 20:28:17 -05:00
ZomgPonies 1f407fa305 Singulo eats darkness, grows out of control? 2014-03-03 01:35:47 -05:00
ZomgPonies 1eaa17abcc Revert "Update PA." 
This reverts commit e6ce757d4c.
 2014-03-03 01:20:34 -05:00
ZomgPonies b03ff54522 Singulo optimizations 2014-03-02 23:25:40 -05:00
Rob NelsonandZomgPonies 42897c12f9 Further optimize narsie. 2014-02-28 19:34:45 -05:00
Rob NelsonandZomgPonies e6ce757d4c Update PA. 
Conflicts:
	code/modules/power/singularity/particle_accelerator/particle_control.dm
	compare_report_tg.txt
 2014-02-28 19:22:20 -05:00
ArynandZomgPonies fcf8509635 Reverted unrelated ZAS modification and unnecessary check. 2014-02-28 17:50:12 -05:00
ArynandZomgPonies 52e2a3d1c6 Lighting seems to be working now. 2014-02-28 17:48:55 -05:00
ArynandZomgPonies 5b2f811b71 Lighting system is too buggy to continue until I know wtf is going on 
Conflicts:
	baystation12.dme
	code/game/turfs/turf.dm
 2014-02-28 17:47:50 -05:00
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00