Commit Graph

14 Commits

Author SHA1 Message Date
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
clusterfack
efbdd6b382 Fixes fixes 2015-03-05 17:59:20 -06:00
clusterfack
b401dbf909 Fixes #3319, you cannot use rpd's when they are far away from you.
Fixes machine frames (but the real way that should have been done originally)
Fixes #2701, r-ust topics should no longer be affected by ghost hands
2015-03-05 17:07:40 -06:00
Rob Nelson
1273d06df5 Combine a shitload of strings. 2013-09-04 13:17:54 -07:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 16:23:59 +10:00
Cael_Aislinn
4052e98723 made circuitboards for fuel injectors and rust core, made said circuits researchable, miscellaneous tweaks and cleanups
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 22:41:59 +10:00
Cael_Aislinn
7f9c95526d consolidated icons
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 19:51:28 +10:00
Cael_Aislinn
d477b7230f reworked rust components to integrate more smoothly with each other, cleaned up a bunch of useability issues, made all relevant components portable, fixed some random bugs, added a mostly nonfunctional map to show an example layout (based on antiqua's engineering layout)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 16:39:42 +10:00
Cael_Aislinn
fea6635060 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/game/verbs/who.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 01:25:47 +10:00
Cael_Aislinn
31349fb7d3 Merge branch 'incremental_tg' r5067 into bs12_with_tgport
removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 14:13:11 +10:00
Cael_Aislinn
0e6939de85 multiple R-UST tweaks and slight updates. this should fix any (all?) known outstanding bugs. i also modified values to be a bit more gameplay sensible (max average output on standard operating levels is ~150-200k per gen)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-27 02:04:44 +10:00
CaelAislinn
93a56064bf WIP antiqua engineering, WIP antiqua supermatter research lab, r-ust updates, fixed dopeghoti's derp.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-05-04 23:56:52 +10:00
CaelAislinn
3cec18affd balances, improvements and tweaks to rust and antiqua. did not to cameras because i have a lecture in six hours.
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-05-01 03:33:29 +10:00
CaelAislinn
2a82b40740 files for alpha version of rust fusion reactor.
rust integrated into antiqua, no breakroom.
lots of fusion bugs, missing features and imbas but it works.

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
2012-04-19 01:20:35 +10:00