Commit Graph

17 Commits

Author SHA1 Message Date
GinjaNinja32
5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
GinjaNinja32
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
SkyMarshal
d1e918e203 Removes step_y variable. 2015-01-06 00:46:45 -07:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
GauHelldragon
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
GauHelldragon
8a8c34fe9a Updated the labcoat object path to work with it's new definition. 2013-01-12 22:19:37 -08:00
petethegoat@gmail.com
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
giacomand@gmail.com
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
Kortgstation@gmail.com
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
petethegoat@gmail.com
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
Kortgstation@gmail.com
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
Kortgstation@gmail.com
3c0bc9098c --Wildwest.dmm
-Removed the rorojelly donuts, that was just cruel and unfair
-Fixed the sandstone walls
-Removed the meatgrinder until it can be fixed

--stationCollision.dmm
-Replaced the wood floors/carpets with the new floor types
-Replaced the armoury lockers with empty ones and put suits in a couple. Having 5 full syndie rigs+jetpacks+eswords and shields was a bit much.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5128 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 06:25:42 +00:00
petethegoat@gmail.com
b67262b32b Ported over BS12 style cameras, which photograph a 3x3 area. It's fuckin radical.
Removed /obj/item/weapon/camera while I was at it (unused).
New cameras are in modules/paperwork/photography.dm.
Standardised folder and paper naming a leetle bit.

Added a new gamekit sprite, also from BS12.

Path changes!
/obj/item/weapon/camera_test > /obj/item/device/camera

Updated all maps with the path changes, excepting oldstation.dmm.

Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5116 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-18 23:41:37 +00: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
petethegoat@gmail.com
d8c376188c Moved the tank dispenser define out of defines.
Changed the tank dispenser path from /obj/machinery/dispenser to /obj/structure/dispenser.

Fixed a bedsheet bin bug.

Updated the map and away missions.
Removed assistantChamber.dmm and desert.dmm.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4906 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 22:43:58 +00:00
johnsonmt88@gmail.com
bf323d3eca Updated my away mission map:
- The safe code is now randomly generated at round start
- The projectile guns now spawn with very little, or no ammunition.
- The energy guns (except the one in the captain's safe) now fire practice laser shots.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4733 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-20 00:28:02 +00:00
johnsonmt88@gmail.com
a8c1116d45 Nodrak's away mission map!
It's a small research station that has been rammed by a syndicate shuttle.
Note that power slowly drains from the map, the SMES does not appear to be outputting any power. Any additional code is contained in stationCollision.dm

I've removed the line about z-level transitions from fileList.txt as those got removed from awaymission zlevels.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4725 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-19 02:24:08 +00:00