Commit Graph
203 Commits
Author SHA1 Message Date
mwerezakandZomgPonies 723979115c Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
ZomgPonies e3ed1c3781 Removed a lot of the useless testing and error logging from the runtime log. 2014-06-16 23:01:41 -04:00
ZuhayrandZomgPonies ef59deb928 First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
mwerezakandZomgPonies cc287d00db Shuttles now dock on arrival and departure
Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm
2014-06-14 04:17:37 -04:00
mwerezakandZomgPonies a54ef207a1 Reworks shuttles to be more extensible
Kudos to Zuhayr for laying the groundwork for this.

Conflicts:
	code/controllers/master_controller.dm
	code/modules/shuttles/shuttle.dm
2014-06-14 04:13:34 -04:00
mwerezakandZomgPonies e9171a9ae3 Adds docking support to shuttles, NanoUI
Conflicts:
	code/game/machinery/doors/airlock.dm
	code/game/machinery/doors/airlock_control.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/modules/shuttles/shuttle.dm
	nano/css/shared.css
2014-06-14 04:10:39 -04:00
ZuhayrandZomgPonies 7c442ac9a3 Added a 'controller' for shuttles (really just a data container), fixed up the admin shuttle verbs into one general verb, changed shuttles to use controller instead of populating lists at spawn.
Conflicts:
	code/controllers/master_controller.dm
	code/modules/admin/admin.dm
2014-06-14 02:10:10 -04:00
Mloc-Argentandalex-gh b5f3379a0f Fixes runtime logging and makes it a config option.
Option starts off by default, since that could be seen as the original behavior...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt
2014-06-02 02:43:43 +02:00
ZomgPonies 5f67943f8e Revert "APC bugfix after someone messed with mah areas!"
This reverts commit ceca0ddbe8.
2014-05-27 21:22:53 -04:00
ZomgPonies 06bbfcf150 Final Nations patch before live testing. This is going to be painful. 2014-05-27 20:09:10 -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
ZomgPonies 3c9dbcc822 First commit for nations gamemode, setting up the framework I'll be using. 2014-05-26 20:02:20 -04:00
mwerezakandalex-gh 4299c2b174 Attempts to fix shuttle not being recallable 2014-05-24 22:08:02 +02:00
ZomgPonies fac32af2f1 First commit of liquid simulation stuff 2014-05-23 14:31:29 -04:00
Jeremy LibermanandZomgPonies bd249e3a53 Mutiny Mode
Conflicts:
	code/__HELPERS/time.dm
	code/controllers/hooks-defs.dm
	code/controllers/hooks.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/podmen.dm
	code/modules/admin/player_panel.dm
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
	code/modules/security levels/keycard authentication.dm
	code/setup.dm
	icons/mob/mob.dmi
2014-05-15 01:01:54 -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
Ccomp5950andZomgPonies db072d7f4a Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/game/verbs/who.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/deadsay.dm
	config/example/config.txt
2014-05-06 01:18:36 -04:00
RazharasandZomgPonies 95b6406adb Makes this shit actually work
Yeah, also added crafting controller to debug controllers(who will need
to debug crafting, but whatever)

Conflicts:
	code/controllers/verbs.dm
2014-05-04 22:55:42 -04:00
Ccomp5950andZomgPonies 970525d065 Adds Mentors.
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).

If the confic option for mentors is set then

	the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt

	staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.

Also:  Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.

Conflicts:
	code/controllers/configuration.dm
	code/game/verbs/who.dm
	code/modules/admin/admin_ranks.dm
	config-example/config.txt
2014-05-04 21:37:37 -04:00
ESwordTheCatandZomgPonies 2382984c03 Some optimization at object pooling, tinkering at beams.dm and reverting useless code.
Conflicts:
	code/modules/projectiles/projectile/beams.dm
2014-04-29 13:39:20 -04:00
ESwordTheCatandZomgPonies 012b45ad32 Limit the pool only to 20 objects. 2014-04-29 13:33:25 -04:00
ESwordTheCatandZomgPonies 44ee513752 Because it use less instructions. 2014-04-20 03:27:17 -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 860aa21db0 Forgot continue on process pipenets. 2014-04-19 19:08:08 -04:00
ESwordTheCatandZomgPonies c5eec28a69 Process diseases optimized loop. 2014-04-19 19:07:58 -04:00
ESwordTheCatandZomgPonies 6f89369486 Process pipenets optimized loop. 2014-04-19 19:06:30 -04:00
ESwordTheCatandZomgPonies cd41bef74e Process events optimized loop. 2014-04-19 19:04:26 -04:00
ESwordTheCatandZomgPonies ec984a7fc7 Process powernets optimized loop. 2014-04-19 19:04:00 -04:00
ESwordTheCatandZomgPonies eed147e119 Process nano optimized loop. 2014-04-19 19:03:48 -04:00
ESwordTheCatandZomgPonies 8612cdc9c0 Process objects optimized loop. 2014-04-19 19:03:36 -04:00
ESwordTheCatandZomgPonies 90bfec8472 Process mobs optimized loop. 2014-04-19 19:03:17 -04:00
ESwordTheCatandZomgPonies 38ad3b0584 Process machines optimized loop.
Conflicts:
	code/controllers/master_controller.dm
2014-04-19 19:02:45 -04:00
alex-gh 521ad31671 Revert the new lighting system. 2014-04-07 23:51:35 +02:00
Rob NelsonandZomgPonies 8fb14a26e9 Initial commit of media suite
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/area/areas.dm
	code/modules/client/client defines.dm
2014-03-10 19:01:41 -04: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
d3athrowandZomgPonies 3e4a4992e4 Loop through garbage queue to remove nulls 2014-03-05 20:29:58 -05:00
Rob NelsonandZomgPonies 745e038a60 QDEL is off by default. 2014-03-05 20:18:59 -05:00
Rob NelsonandZomgPonies 8bd9502981 GC fixes, debug verb for toggling. 2014-03-03 19:11:20 -05:00
Rob NelsonandZomgPonies 53f1810651 Revert /tg/ GC
Conflicts:
	code/controllers/garbage.dm
2014-03-03 19:10:45 -05:00
ZomgPonies 84231d2feb Removed some debug text 2014-03-03 01:27:25 -05:00
Rob NelsonandZomgPonies 30996e58d5 Use /tg/'s better GC code.
Conflicts:
	code/controllers/garbage.dm
2014-03-02 19:46:51 -05:00
Rob NelsonandZomgPonies e963a4993a GC tuning 2014-03-02 19:39:17 -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 ba9c185975 Gc typo 2014-02-19 21:12:44 -05:00
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Jordie0608andZomgPonies 7ab1aac59e Outright removed toggle admin jump,spawn and revive buttons
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/topic.dm
2014-01-31 02:47:04 -05:00
Rob NelsonandZomgPonies b8a6504be3 Perform additional checks on qdel(), add some docs. 2014-01-31 02:29:31 -05:00
Rob NelsonandZomgPonies 33398a1297 Get rid of debugging. 2014-01-29 23:47:13 -05:00
d3athrowandZomgPonies 65c0e3faac Should fix the issue of the GC turning gliding movement off 2014-01-29 23:46:54 -05:00