Neerti
e52a0ea332
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
...
Conflicts:
.travis.yml
code/game/gamemodes/changeling/changeling_powers.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/turfs/simulated.dm
code/global.dm
icons/misc/fullscreen.dmi
polaris.dme
2015-10-10 23:17:26 -04:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
Woodrat
a2886198e1
Woodrat Work v7 Bugbash
...
- Engineering Monitoring Room door access fixed.
- More signs installed, including cargo. Woodrat should no longer get lost in his own museum.
- Missing buttons in the engine room readded.
- Security request console moved upon request.
- Security voidsuit added to the armory.
- Best Doctor 2552 plaque, in the way of air alarm fixed.
- Research dock hallway airlock access fixed.
- Doubled the amount of charge in the main SMES.
- Robotics should now have glass, metal, and plasteel materials.
- Light and camera fixed in the AI chamber.
- Removed Area Air Control scrubber from RD's office as it is now pointless.
- Added AAC to toxins storage out on the outpost.
- Windoor access in engineering foyer fixed.
- Added tiny change to engine (plz no threads/bans). Manifold with endcap on waste line for potential cooler.
- Guest pass comp. added to medical, buttons fixed for door. Windoor medical access added.
- Missing Dock 1 firelock added.
- Meducal HUD added to the CMO Office.
- Transfer shuttle, fixed (again). Notify me if it doesn't work.
- Size complaints addressed. Of the map you pervs.
2015-08-03 22:25:52 -07:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
Jarcolr
868dea5681
Grammar patch 1
...
This is just the first one of many.
2014-04-08 14:48:31 +03:00
Chinsky
582bebc0d1
Adds signs pointing where department is.
...
Change dir var to change direction of arrow.
2013-12-18 12:34:53 +04:00
Spamcat
5f690e150d
Part 3: fixing shit
2013-07-06 02:53:06 +04:00
Spamcat
63de302a09
Part 2: construction.
2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c
Stage 1: deconstruction.
2013-07-06 02:53:01 +04:00
Cael_Aislinn
bb5a349fcf
Merge branch 'incremental_tg' r5600 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/controllers/master_controller.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/machinery/computer/cloning.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/under/ties.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/silicon/say.dm
code/modules/mob/mob_defines.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/modules/projectiles/projectile.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/glass.dm
code/setup.dm
config/config.txt
html/changelog.html
icons/effects/effects.dmi
icons/mob/feet.dmi
icons/mob/head.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/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
maps/tgstation.2.1.0.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:23:37 +10:00
ericgfwong@hotmail.com
4d9af5c0a4
Recolored a bunch of objects to make medbay's department colours more clear and consistent. The colours are green/white.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5593 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-21 00:11:48 +00:00
Cael_Aislinn
cf6aadef09
remove some unused files, tick barsigns.dm and removed duplicate definition
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-14 21:23:47 +10:00
Cael_Aislinn
990090326d
compile fixes and cleanup
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 02:36:52 +10:00
petethegoat@gmail.com
8594527d2d
Updated signs.
...
Fixes issue 1015. Layering issue, false wall, station map
Path changes!
/obj/effect/sign > /obj/structure/sign
/obj/effect/decal/poster > /obj/structure/sign/poster
/obj/effect/sign/maltesefalcon1 > /obj/structure/sign/maltesefalcon/left
/obj/effect/sign/maltesefalcon2 > /obj/structure/sign/maltesefalcon/right
Updated all maps (except oldstation.dmm) with the new paths.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5111 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 18:43:41 +00:00
