Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
Cael_Aislinn
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
giacomand@gmail.com
e9fd2037d2
-Committed lpeters's patch which Fixes Issue 1189. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=11549
...
-Made the shower not require power.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5391 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-24 01:38:36 +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
johnsonmt88@gmail.com
867b21c7ce
File restructuring!
...
This brings down a bunch of defines from /code/defines/obj.dm unto their appropriate files.
I've moved morgue.dm from game/machinery into game/objects/structures since that file contains no machines.
I've reorganized the objects/items/stacks folder and made a 'sheets' and 'tiles' folder to keep things separate
I've separated stool_chair_bed.dm into its own folder which now contains the files: stools.dm, chairs.dm, bed.dm and alien_nests.dm to make it a little easier to go through.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4582 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-29 18:00:30 +00:00
SkyMarshal
d4393c482d
Removed a duplicate proc. Pimped out the Blueprints.
2012-06-13 17:05:43 -07:00
Atso.Sariola@gmail.com
c85f20f54f
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1057 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-18 03:23:40 +00:00
n3ophyt3@gmail.com
f93a9e2b2a
APC frames no longer CPU-lock the server when used in an area that hasn't been blueprinted to not being space.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@974 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-07 01:57:25 +00:00
rastaf.zero@gmail.com
427313e0ad
Shocking overhaul. Fixed bugs are:
...
- shocking by autolathe, vendomats and airlocks works if powernet has power OR if APC has charged battery;
- autolathe able to shock without cable underneath;
- improvements from Barhandar and Errorage are included;
- making stungloves may electrocute you;
- handmade stungloves partially loses insulating;
Eliminated 4-seconds lag caused by all apcs changing state to "fully charged" after first few minutes of game.
Fixed message "The airlock's motors resist your efforts to pry it open."
Latest innovations in nanotechnologies! Matchbox now fits in pocket!
Fixed burn_skin(), so containment field now hurt people properly.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@919 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-27 16:40:36 +00:00
rastaf.zero@gmail.com
1de3867666
Welding fuel now a bit harmful when drinking/injecting.
...
Admin Crew Manifest can read assignments from PDA.
Some other id-in-pda related glitches fixed.
APC frame can we unwrenched in hand.
Medical computer now have DNA records.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@910 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-24 01:00:20 +00:00
rastaf.zero@gmail.com
09e0bcf987
Stackable items redo. Many improvements, massive code clean up.
...
Metal and related materials now noticeable more user-friendly.
Added new canister color: yellow "CAUTION". Used for newly created from metal canisters. Can be relabeled once.
Some typos were fixed.
dsay verb now uses fakekey in stealth mode.
AI cannot remove the cell from the charger.
Added alientalk chat prefix: ":a" by Barhandar. Also added keyboard layout independent russian prefixes.
Binary translator done by more convenient may by Barhandar.
Is possible now to wash bloody hands in sink.
Probably fixed bug causes gibbed revheads be not counted as dead.
Some other fixes.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@752 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-03 01:26:01 +00:00
rastaf.zero@gmail.com
f2c2a3b8c1
APC building and disassembling (/obj/item/weapon/module/power_control needs to be placed on map or spawned by admin or removed from existing APC, other components are easily accessible)
...
APC emagged/broken and wires_exposed icons was swapped, fixed.
APC hacking now can properly shock you
Added station blueprints!
* now possible to rename areas
* now possible to create new bays
* space now haven't free power supply
Blueprints aren't placed on map yet.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@670 316c924e-a436-60f5-8080-3fe189b3f50e
2010-12-19 12:09:37 +00:00
