9b19d7dacf
atmos: remove a few force-deletes in merge code
...
Removes del(giver) from pipeline/merge(), turf/assume_air() and
atom/assume_air().
Thanks to valzargaming on reddit/github for pointing it out.
fixes #4717
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-04-07 17:28:09 +01:00
753a2ef08c
Code Effeciency Project: Vent scrubbers have a bit more sanity.
...
No longer checking for 0.00000000000000000000000001 moles of toxins scrubers can only detect stuff worse then 0.001 moles.
Have a nice day.
2014-04-04 13:21:47 -05:00
63a0f1185e
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
code/game/dna/genes/powers.dm
code/game/objects/items/devices/PDA/PDA.dm
2014-02-20 19:16:23 -06:00
e140998f86
Pipe painter bad-fix revert
...
Oops. Thanks Segrain.
2014-02-20 16:46:43 +13:00
f451fd42c1
Pipe tweaks
...
- updated update_icon() for pipes and manifolds to change the color instead of the sprite
- updated subtypes to use global defines for colors instead of hard coded html refs
- added an alpha tweak to hidden pipes for the sake of mapping (DM doesn't render semi-transparent icons correctly, but it does handle var/alpha tweaks) - this is overridden when the pipe is spawned in the game world with New()
(Thinking about it, we could potentially do away with the transparent pipe sprites by just using the alpha variable. May do this later.)
- fixed pipe painter
- unwrenched pipes now inherit their source pipe color, and also inherit it when reattached to a pipe network again
2014-02-20 15:50:12 +13:00
42946bd2ad
Vent pump efficiency
...
- Tweaked the pressure delta check to "> 0.5", so pumps will stop transferring minor volumes of air every tick (because a delta of 3.05176e-005 is still greater than 0). This also reduces the calls to gas_mixture/merge() and gas_mixture/remove() significantly once the air in the environment has equalized.
The results after running the game for 10 minutes:
```
Proc Name Self CPU Total CPU Real Time Calls
/obj/machinery/atmospherics/unary/vent_pump/process 0.035 0.141 0.141 3808 <- before
/obj/machinery/atmospherics/unary/vent_pump/process 0.014 0.042 0.043 3808 <- after
```
2014-02-18 16:16:10 +13:00
47cca1dde8
Fix for #4446 .
2014-02-16 18:08:12 +03:00
8fc4e4e7db
Minor tweaks and fixes for airlock equipment
...
- Fixed DP vent pumps not changing direction
- Made airlock_sensor more versatile (and backwards compatible with old airlock code)
- Added airlock_sensor and access_button airlock subtypes for easier mapping
2014-02-13 14:21:18 +13:00
3978492ca4
Removed ID requirement for gas filters
...
So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.
2014-02-08 18:35:01 +13:00
8a58652c41
Merge pull request #4385 from Loganbacca/pipes-cleanup
...
Pipe standardization
2014-02-06 13:43:05 +10:30
f1b77d0ed6
Master merge.
2014-02-05 18:34:23 +10:30
92cc536133
Pipe standardization
...
Cleaned up pipes.dm
Changed pipe subtypes to the following layout:
pipe
simple/manifold/manifold4w
hidden
colour
visible
colour
Did a complete pass of the station to standardize all pipes (yes, nearly 2500 changes)
(Haven't done the research base air and scrubber pipes yet, and atmos will be done with my engineering redesign)
2014-02-05 15:16:07 +13:00
83246df6d5
Fix for #4297 .
2014-02-03 07:32:53 +03:00
c0d5ffd022
Added no-network check to heat_source to fix a runtime if not connected to a network.
2014-01-24 09:56:02 +00:00
75348f6dca
Fix for #4293
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-01-13 14:10:56 +00:00
8ecfd56540
Some turf cleanup and the like. Trace gases are now properly handled by ZAS on world load.
...
Fixes #2485
2014-01-08 21:36:03 -07:00
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
a1f55a50b1
Massive click code rework by SuperSayu, ported from TG.
...
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648
Hopefully done right this time.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-10-08 20:27:39 +01:00
e9bf414820
Refactors code to work with BYOND 500.
...
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
/obj/item/color is now item_color
/obj/atmospherics/color is now pipe_color
simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-22 12:39:48 +01:00
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
fa76668500
Colouring tempfix.
2013-08-15 10:29:29 +03:00
c8381b6e90
Pipe painter addition.
2013-07-31 14:23:30 +03:00
1d9fe082d7
made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-05-19 18:50:15 +10:00
3b41db4a18
Made circulators and TEGs work, updated Rowtree's station with a functional powergrid and TEG battery.
...
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com >
2013-04-24 15:58:39 -07:00
e8d7cc1e61
Fixes the bug with Filters allowing insane overpressurization.
2013-04-16 12:43:19 -07:00
c5f461e90d
circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-06 01:28:57 +10: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
4dcf0f0c76
alright, 4-way manifolds, manual t-valves, pipe caps.
2013-01-05 21:39:39 -08:00
3c9d5b161c
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-01-05 20:50:47 -08:00
93476a2c16
Finishing touches on Air Alarms, Firedoors, and Central Atmos Control
2013-01-04 22:00:56 -07:00
d01770ad56
Bringing in 4-way manifolds, pipe caps, manual tvalves.
2013-01-03 05:47:07 -08:00
b9bb759cd8
-Multiple fixes for machinery not correctly updating their icons when depowered.
...
-Gave request consoles an off sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5421 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-30 02:20:03 +00: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
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
d4dc5ae070
Moved var/force from /obj/item to /obj so that everything gets it, including structures and machines that get tossed around using Telekenesis. The default force is still 0. This should finally put a stop to a large number of runtimes.
...
Runtime fix for being hit by something without there being a usr. This was most likely due to explosions or possibly mass drivers.
Runtime fix for simple animals using department channels. Only parrots can use them now as they are the only simple animal with the 'ears' variable.
Runtime fix for the mech's energy relay process() when there is no battery in the mech.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5405 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-27 02:08:41 +00:00
7caff5dd42
-Proper fix for the scrubber/vent runtimes.
...
I made the vents and scrubbers update the area scrubber/vent info themselves, meaning that an air alarm isn't required to initialize the area/vent info and to stop it from being null.
This will add more flexibility in the future.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5331 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 18:59:47 +00:00
74ac2b9611
-Fixed vent pumps/vent scrubbers runtiming on deletion when it is dragged and then consumed by a singularity.
...
-Fixed vents not correctly updating the area with their deletion.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5329 316c924e-a436-60f5-8080-3fe189b3f50e
2012-12-15 16:54:36 +00:00
2f7baa26f8
antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-12-01 17:49:34 +10:00
75a40c33e5
Merge pull request #1909 from AterIgnis/airlock_update
...
Airlock update
2012-11-12 12:17:16 -08:00
2faf9c7a9c
The groups exist, but the lists do not.
2012-11-12 02:41:12 +02:00
dc396ddb57
Fix for Issue 1868
2012-11-12 02:24:28 +02:00
cea430cc77
Adds high_volume vents
...
Can be used in place of airtank in station airlocks - vents don't depend on tank storage, and do pressure equalisation faster a bit
2012-11-11 03:30:03 +04:00
b00c0c2a9f
-New sprites APC sprites by TankNut!
...
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-03 14:45:29 +00:00
6a2d78bc94
-Killed the updateDialog lag. I added a check to see if there were any mobs to update, if not it will stop checking until a user uses the machine again. I had to replace all the machine = src and machine = null with procs to help make it manageable. I believe this is one of the culprits causing the server to lag as the round goes on, as more players will interact with machines.
...
-Atmos delay is now based on active players, to help fight lag for massive player rounds.
-Changed some for(blah in world) loops to use the correct lists.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4958 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:15:51 +00:00
dd538fd3c5
Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
...
Conflicts:
code/game/gamemodes/events.dm
code/game/gamemodes/wizard/veilrender.dm
code/game/jobs/job/captain.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/structures/grille.dm
code/modules/mob/living/simple_animal/life.dm
code/setup.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-22 20:15:05 +10:00
6f7c26629d
-Changed xeno to have a safe way to hatch eggs with plasma.
...
http://imgur.com/80LJx
-Added a turf meter which shows the air contents of a tile.
-Added a simple vent controller for the dual vents.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4935 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-22 05:41:00 +00:00
01d3e3bf79
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
...
Conflicts:
code/datums/disease.dm
code/modules/reagents/Chemistry-Reagents.dm
icons/turf/areas.dmi
maps/tgstation.2.0.9.1.dmm
yep, this time going to merge map updates before making map changes >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2012-10-21 01:25:04 +10:00
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
d25a5d5aa3
Fixes issue 1001.
...
Fixes issue 994. (Chemsprayers are not included)
Fixes issue 990.
Adding some instant admin logs and server logs for some stuff in emitters/PA. See image. http://i.imgur.com/7kQpH.png
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4904 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 14:27:23 +00:00
cfb1ad5551
Committing for Aranclanos:
...
Fixes issue 986. (Constructed normal walls named wrong)
Fixes issue 1000. (Destroyed vent still shows up in air alarm)
Fixes issue 1003. (Glowshrooms don't give off light when planted!)
Fixes issue 1004. (Issues with (?) Command)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4884 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 16:45:18 +00:00
Mloc-Argent
