SkyMarshal
9591c3773e
Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
...
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -07:00
Cael_Aislinn
e6c70937e5
Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/game.dm
code/__HELPERS/type2type.dm
code/datums/helper_datums/getrev.dm
code/game/atoms.dm
code/game/gamemodes/events.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/newscaster.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/telecomms/telemonitor.dm
code/game/machinery/telecomms/traffic_control.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/objs.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/admin/IsBanned.dm
code/modules/admin/admin.dm
code/modules/admin/verbs/adminsay.dm
code/modules/admin/verbs/getlogs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/miscellaneous.dm
code/modules/flufftext/TextFilters.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mine_items.dm
code/modules/mining/mint.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/living_defense.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/photocopier.dm
code/modules/power/gravitygenerator.dm
html/changelog.html
icons/mob/head.dmi
icons/mob/human_face.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-28 01:07:36 +10:00
cib
5360915221
Fixes issue #2032
...
The proc to get zlevel map files used lowertext on the filename. That is bad, for obvious reasons(breaks uppercase paths on linux).
2012-12-16 18:16:21 +01:00
Cael_Aislinn
e8b44dca13
made away missions actually load properly, also added a command report / admin report when they become active. made all away missions except wizard academy possible destinations
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-27 19:59:05 +10:00
elly1989@rocketmail.com
7b720a20b6
>Moved most of the helper procs into code/__HELPERS. If you see ANYTHING generic enough to be a helper proc just throw it in there and help purge the copypasta 5ever
...
>Replaced dd_text2list, dd_text2listcase, tg_text2listcase and tg_text2list with text2list and text2listEx. text2list will return a list of each and every character in the string if you set separator=""
>added return_file_text(filepath) which returns text from a file after doing some checks: does the file exist? is the file empty? It prints helpful error messages to the world.log if it runs into problems
>Replaced dd_file2list(filepath, seperator) with file2list(filepath, seperator). It just calls text2list(return_file_text(filepath), seperator). rather than copypasta
>Replaced time_stamp() so it's not as retarded
>Lots of the world setup stuff uses file2list now, rather than file2text -> sanity -> text2list
>Added error() warning() testing() procs. These print messages to world.log with a prefix. e.g. ## ERROR: msg.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4948 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-24 14:39:36 +00:00
Cael_Aislinn
2f853fe23a
Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/objects/items/devices/radio/radio.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client procs.dm
code/modules/mob/living/say.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_cleanup.dm
code/modules/paperwork/paperbin.dm
html/changelog.html
icons/turf/areas.dmi
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-21 00:25:05 +10:00
petethegoat@gmail.com
aa60fde7f4
Fix for borked atmos on away missions. This may still need some further tweaking, but it definitely fixes the issue. I looked at the powernet issue too, but I couldn't reproduce it anymore. Maybe it's fixed.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4887 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-16 02:08:51 +00:00
Cael_Aislinn
548f60d25d
Merge remote-tracking branch 'remotes/git-svn' r4881 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/gamemodes/events.dm
code/game/machinery/doors/door.dm
code/game/machinery/gateway.dm
code/game/objects/items/devices/flashlight.dm
code/game/sound.dm
code/global.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/handlabeler.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/photocopier.dm
code/modules/paperwork/stamps.dm
code/world.dm
html/changelog.html
maps/RandomZLevels/fileList.txt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-15 23:17:18 +10:00
petethegoat@gmail.com
65f4910c94
Updated trashbag code a teeny tiny bit. Mostly just changing it to use proper text styles.
...
Added a world.log message when away missions are loaded.
Fixed a spelling error in stationCollision.dm.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4868 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:01:54 +00:00
Cael_Aislinn
e645d78f11
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/datums/organs/organ_internal.dm
code/datums/vote.dm
code/defines/atom.dm
code/defines/procs/gamehelpers.dm
code/defines/turf.dm
code/game/algorithm.dm
code/game/cellautomata.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/jobs/job/captain.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/law.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/weapons/cigs_lighters.dm
code/game/objects/structures/electricchair.dm
code/game/turfs/turf.dm
code/game/vote.dm
code/hub.dm
code/modules/admin/admin_verbs.dm
code/modules/awaymissions/zlevel.dm
code/modules/client/client defines.dm
code/modules/food/food.dm
code/modules/food/meat.dm
code/modules/food/recipes_microwave.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/hud.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/login.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_defines.dm
code/modules/mob/new_player/login.dm
code/modules/paperwork/filingcabinet.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/photocopier.dm
code/setup.dm
icons/effects/genetics.dmi
interface/interface.dm
interface/skin.dmf
maps/RandomZLevels/fileList.txt
various misc mergefixes and todos
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-22 21:29:04 +10:00
giacomand@gmail.com
384b2717b0
-Added a "landmarks_list"; the game will now check for landmarks in the list instead of the world.
...
-Did some optimizing to AI freelook.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4670 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 22:27:06 +00:00
petethegoat@gmail.com
3f7985844e
More work on away missions. They're almost playable now.
...
Things left to do mainly involves stuff interacting with Z8 - counting people as dead, making sure teleports don't work, etc.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4661 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 23:50:54 +00:00
Cael_Aislinn
c4bd191222
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/defines/obj.dm
code/game/gamemodes/events.dm
code/game/machinery/newscaster.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/stacks/stack.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/turfs/turf.dm
code/modules/awaymissions/zlevel.dm
code/modules/maps/fromdmp.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/mob/living/simple_animal/life.dm
code/modules/mob/mob_movement.dm
code/setup.dm
icons/mob/uniform.dmi
icons/obj/closet.dmi
icons/obj/clothing/uniforms.dmi
maps/RandomZLevels/assistantChamber.dmm
maps/RandomZLevels/fileList.txt
maps/tgstation.2.0.9.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-09-04 22:19:03 +10:00
petethegoat@gmail.com
08f350acda
Committing work on away missions.
...
Standardised cigs_lighters.dm a bit.
Removed the SORD, and some unused and shit flasks.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4609 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:58:11 +00:00
