Arokha Sieyes
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
Arokha Sieyes
f0779da58d
Stage 2 tag removal
2018-04-18 17:37:41 -04:00
Arokha Sieyes
78134b2b29
Stage 1 tag removal
2018-04-18 17:33:22 -04:00
Arokha Sieyes
40dcbcca33
Remove old garbage levels
2016-05-15 14:55:36 -04:00
Arokha Sieyes
bb1470955a
Have some gateway maps
2016-05-15 14:44:48 -04:00
GinjaNinja32
ea261a7a65
Shuttle walls now rotate correctly with client.dir
2015-08-02 20:24:22 +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
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
petethegoat@gmail.com
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
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
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
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
d_h2005@yahoo.com
0e52879814
Away Mission Tweaks:
...
-Fixed a few doubled-up tiles and such on my black market away mission.
-Fleshes out the academy a bit more: adds some books to the library, changes one of the SMES rooms into a build-your-own telecomm station.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4911 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-19 00:58:56 +00:00
d_h2005@yahoo.com
d1c4c8bc4e
-Committing my second away mission map: It's time to go back to school!
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4886 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-15 21:02:40 +00:00
Arokha Sieyes