94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
ea261a7a65
Shuttle walls now rotate correctly with client.dir
2015-08-02 20:24:22 +01:00
5cbb703609
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/jobs/access.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/update_icons.dm
code/modules/organs/organ.dm
code/modules/reagents/Chemistry-Holder.dm
code/setup.dm
2015-07-27 10:20:20 +02:00
65ac3d97d0
Revert "get rid of mob.see_in_dark and species.darksight"
...
This reverts commit 278a4c38ec
2015-07-22 15:14:40 +01:00
697157a6bc
Changes all gun names to generic descriptive names, moves names into desc. Updates the descriptions of various guns to be more loreful.
2015-07-15 22:08:21 -04:00
34fdc4712e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/names.dm
code/game/jobs/job/silicon.dm
code/game/objects/items.dm
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/carbon/brain/life.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/nano/modules/alarm_monitor.dm
code/setup.dm
2015-07-14 08:21:12 +02:00
278a4c38ec
get rid of mob.see_in_dark and species.darksight
...
They don't work with the current lighting system and cause weird artifacts.
Signed-off-by: Mloc <colmohici@gmail.com >
2015-07-09 19:17:04 +01:00
73a746e455
Non-code .dm files with escapes
2015-05-30 14:12:26 +01:00
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
f9f99d61b2
Map changes.
...
sed -rbi 's#obj/structure/table([^/])#obj/structure/table/standard\1#g' maps/**/*.dmm
2015-05-13 19:09:40 +01:00
d1e918e203
Removes step_y variable.
2015-01-06 00:46:45 -07:00
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
59821a2174
examples for fileList.txt
2013-08-12 13:55:54 +01:00
1bca7c7454
Made character HUD show pain level instead of actual health.
...
Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
2013-08-04 00:12:38 +04:00
11e27c5999
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
...
Conflicts:
code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
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
9e1aec0027
Virus2 machinery in Virology.
...
IA office.
2013-01-24 17:35:52 +04:00
85c9431aa4
Merge branch 'bleeding-edge-freeze' of git://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
baystation12.dme
2013-01-15 13:59:10 -08:00
d532ec9712
add+fix missing files for jungle away mission, re-add missing atmos and security rigs, refactor and cleanup rigs
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 23:29:53 +10:00
8581932c57
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/game/objects/items/toys.dm
icons/mob/back.dmi
icons/mob/suit.dmi
icons/mob/uniform.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/uniforms.dmi
icons/obj/weapons.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 22:14:46 +10:00
8a8c34fe9a
Updated the labcoat object path to work with it's new definition.
2013-01-12 22:19:37 -08:00
ccf8597a3e
Removed the 'AnyColor' paint can from the spacebattle map, as the item definition was commented out.
2013-01-12 22:15:19 -08:00
bdeb96b7e5
Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/__HELPERS/game.dm
code/controllers/shuttle_controller.dm
code/datums/datumvars.dm
code/datums/supplypacks.dm
code/defines/obj/storage.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/command_alert.dm
code/game/area/Space Station 13 areas.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/dust.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/jobs/access.dm
code/game/jobs/job/assistant.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job_controller.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/ai_core.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/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/newscaster.dm
code/game/machinery/recharger.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/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/working/ripley.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/flashlight.dm
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/medical.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/secstorage/secstorage.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/storage/firstaid.dm
code/game/objects/items/weapons/storage/kit.dm
code/game/objects/items/weapons/storage/storage.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/electricchair.dm
code/game/objects/structures/extinguisher.dm
code/game/objects/structures/watercloset.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/vehicle.dm
code/global.dm
code/modules/DetectiveWork/evidence.dm
code/modules/admin/IsBanned.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/preferences.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/critters/critter_defenses.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/Hallucination.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/ai/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/power/cable.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
config/config.txt
html/changelog.html
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
icons/obj/grenade.dmi
icons/obj/projectiles.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 22:12:31 +10:00
74fcf179c6
updated area on arcticwaste.dmm
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 15:02:07 +10:00
d4b3d19793
cleaned up a bunch of away missions, made only the peaceful-ish ones spawn, added my jungle map and susu's research labs map
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 14:52:43 +10:00
7af1bc4027
Removed some files with old definitions left over from r5494.
...
Updated the map and all away missions again.
Full (really, this time, i think) list of path changes: http://pastebin.com/raw.php?i=7VJ7UBDh
/obj/item/weapon/storage/flashbang_kit > /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box > /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit > /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit > /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit > /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit > /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket > /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps > /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox > /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit > /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed > /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit > /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox > /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes > /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit > /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox > /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit > /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit > /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs > /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag > /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel > /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag > /obj/item/weapon/storage/bag/trash
/obj/item/weapon/secstorage/ssafe/HoS > /obj/item/weapon/storage/secure/safe/HoS
/obj/item/weapon/secstorage/ssafe > /obj/item/weapon/storage/secure/safe
/obj/item/weapon/storage/crayonbox > /obj/item/weapon/storage/fancy/crayons
/obj/item/weapon/secstorage/sbriefcase > /obj/item/weapon/storage/secure/briefcase
/obj/item/weapon/storage/matchbox > /obj/item/weapon/storage/box/matches
/obj/item/weapon/storage/monkeycube_box > /obj/item/weapon/storage/box/monkeycubes
/obj/item/weapon/storage/satchel > /obj/item/weapon/storage/backpack/satchel
/obj/item/weapon/storage/snappopbox > /obj/item/weapon/storage/box/snappops
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5495 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:35:33 +00:00
11b17c4442
Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
...
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.
Updated all maps.
I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.
Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit > /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box > /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit > /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit > /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit > /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit > /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket > /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps > /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox > /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit > /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed > /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit > /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox > /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes > /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit > /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox > /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit > /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit > /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs > /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag > /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel > /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag > /obj/item/weapon/storage/bag/trash
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00
7efc1aafef
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/turf/areas.dmi
maps/RandomZLevels/stationCollision.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 22:26:24 +10:00
aae42d928a
Merge branch 'incremental_tg' r5200 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/__HELPERS/type2type.dm
code/__HELPERS/unsorted.dm
code/datums/datumvars.dm
code/datums/disease.dm
code/datums/organs/organ_external.dm
code/datums/supplypacks.dm
code/defines/obj.dm
code/game/area/areas.dm
code/game/atoms.dm
code/game/gamemodes/cult/cult_structures.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/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/civilian.dm
code/game/machinery/alarm.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/effects/decals/contraband.dm
code/game/objects/effects/signs.dm
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/PDA/cart.dm
code/game/objects/items/weapons/photography.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/window.dm
code/game/sound.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/DetectiveWork/evidence.dm
code/modules/DetectiveWork/footprints_and_rag.dm
code/modules/DetectiveWork/scanner.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminpm.dm
code/modules/awaymissions/gateway.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/client/preferences.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mint.dm
code/modules/mining/ores_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/say.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/setup.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/powerarmor/powerarmor.dm
code/world.dm
html/changelog.html
icons/effects/96x96.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/turf/areas.dmi
icons/turf/walls.dmi
maps/RandomZLevels/fileList.txt
maps/RandomZLevels/spacebattle.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 00:23:22 +10:00
a296018ed1
Got rid of evac part lights. No fun allowed.
...
Also forgot to change paths for lab coats in away missions, fixed that now.
2013-01-06 12:09:23 +04:00
3ced7fbbd1
Fixed paths in away mission maps
2013-01-04 03:27:13 +04:00
5768d6a741
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-31 02:01:37 +10:00
a04eb3f275
-Changed emitters.
...
Emitters will now need to be wired.
Emitter type has changed to /obj/machinery/power/emitter
Fixed cables not correctly disconnecting power machinery from the powernet after being removed.
-Fixed a typo with smashing tables/racks.
-Fixed maps having incorrect types.
-Fixed singularity EMPing when at stage 1.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5423 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 10:47:25 +00:00
1f630254da
Actually added my map to the selection file.
2012-12-29 14:09:27 -06:00
f7249bd519
Added my completed away mission, along with the necessary sprites and code. A Soghun-Compatible RIG suit has also been added.
2012-12-29 01:59:19 -06:00
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
cdc4332769
-Should fix machines not depowering correctly. Let me know if you find a machine which should be powered off but isn't.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5388 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 00:12:12 +00:00
470321bd52
Fixed the gateway on challenge.dmm being calibrated.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5367 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-21 07:02:24 +00:00
a55b8b6ad7
Ported the last of the critters to simple_animal.
...
Removed all critter code/replaced it with their simple animal paths where applicable.
Replaced the critters on the maps with simple_animal versions.
If I missed any vars/icons/etc when I ported them over, let me know.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5210 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 19:06:15 +00:00
09e9762e40
Added a check for the items w_class when you try equipping it to a suit storage slot. This means the ion rifle, SAW, and staff of change will no longer fit on armour.
...
Added a new gun/projectile which deals brainloss as well as causes hallucinations.
Replaced the pulse rifle in stationCollision with the new gun.
Gave the HoS gateway access so he can banish people.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5201 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-26 12:50:25 +00:00
c69f0cab36
Removed /obj/effect/deskclutter at last.
...
Updated all maps. (and updated stationCollision.dmm to have new hivebots, cmon kor)
Removed the action button from the flare, as you only ever turn it on once.
Removed a bunch of unused sprites in items.dmi.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5190 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-25 19:58:28 +00:00
fd9f6490f1
Updated listeningpost.dmm to look nicer and be a bit more interesting.
...
Updated the Stechtkov pistol. Should be pretty solid now.
Made a returning ex_act for snow floors.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5182 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:38:24 +00:00
04b8d36ca7
Ported syndicates over to hostile simple animals.
...
Replaced the old syndicates in the new ones in all the away missions.
Removed a now unused "issyndicate" proc.
Ported the obstacle smashing over to hostile animals. This means carp will attempt to break into escape and stuff now. Scary! (I can make this syndicate only again if it becomes a problem)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5177 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 14:17:42 +00:00
073737a773
Listening Post, a new away mission, is done. Thanks for the help Giacom.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5172 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 04:38:09 +00:00
67ee202a2e
Fixed everyone seeing in the dark.
...
Committing my almost finished away mission listeningpost.dmm so Giacom can look/help me with the telecomms.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5171 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 04:09:32 +00:00
ad4317fa36
Put in a bunch of missing windows on the space battle map.
...
Replaced a ton of platings/floors that were bordering space with airless versions in space battle, blackmarketpackers, and stationCollision
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5170 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-23 01:09:54 +00:00
c02361276e
Re-added a buncha Faithless Brotemis took out, final room became pretty damn easy without them.
...
Lowered the damage shadow people take from 2 brute a tick to 1 brute a tick (so they don't have to spend forever in the dark waiting for the light damage to go away).
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5165 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 15:32:05 +00:00
bae59832d6
Fixed challenge.dmm having a centerstation gate piece instead of a centeraway gate piece.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5163 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 10:45:21 +00:00
042fb8a8b6
Accidentally left files out of the last commit.
...
Accidentally changed emitter projectile damage to 30 last commmit as well (I'd been testing making Ikarrus's map harder). I dunno if it should be switched back or what, it won't really make a difference in normal gameplay.
Committing Ikarrus's new map.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5161 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-22 08:18:50 +00:00
Chinsky