Commit Graph

728 Commits

Author SHA1 Message Date
AnturK 1c5c0afc41 * SPRITES! 2015-04-16 12:17:54 +02:00
AnturK bc71b4b8b3 * Fixes observers not seeing abductor hivemind
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Cheridan f3c9a82b04 Merge pull request #8867 from Jordie0608/hahastealthreverts
Un-reverts bar changes
2015-04-12 13:33:34 -05:00
Metacide 5ed195ccc5 Updated MetaStation.v41A.dmm to MetaStation.v41A.II.dmm
*Added extra hammer and gavel to the courtroom locker
*Added a fluff book to the vault safe
*Added three power control boards to the derelict
*Fixed disconnected APC in secure lab / xenobiology
*Fixed bar camera names
*Fixed name of newly added basketball
*Fixed item path compile issue with biohazard lockers in medbay
2015-04-12 17:30:32 +01:00
Jordie0608 db1147df6e un-reverts bar changes 2015-04-10 16:30:58 +10:00
phil235 e34bce47b9 map conflicts fix 2015-04-08 19:42:48 +02:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Jordie0608 a2a2462f82 more path fixes 2015-04-08 23:10:09 +10:00
Jordie0608 ad33641101 Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
Jordie0608 7bc3c9c6d8 Map path changes 2015-04-08 16:01:23 +10:00
Metacide d0c6b90757 Updated MetaStation.v40D.dmm to MetaStation.v41A.dmm
Added (provisionally) a public autolathe to the RD lobby
 Added (provisionally) a set of chemistry machines to xenobiology (aka secure lab)
 Added (provisionally) another independent set of shutters in the HoS office protecting the upper space viewing window
 Added (provisionally) two drones to the derelict station, as well as some metal, glass, fuel, two duffel bags and an airlock painter
 Added more gear to the vault safe including an anonymous identity and a silenced pistol
 Added insanity wing to the prison, rearranged it slightly, neatened reeducation room
 Added derelict auxiliary atmospherics chamber just outside the atmos external airlock, for burn-chamber construction etc.
 Added a disposal unit to the lower chemistry lab desk and rearranged it to be more usable
 Added a box of silver IDs to the HoP's room
 Added two shot-glasses to the maint. bar
 Added eggs to the Recovery Shuttle kitchen
 Added fully-functioning biogenerator to the Recovery Shuttle on roundstart
 Added throwing-stars to the armoury random contraband gun spawner
 Added teleport computer and missing air alarm to bridge
 Added collectable HoP hat to the corporate showroom
 Added heater to maintenance medbay
 Added basketball to maintenance
 Added suit storage unit to HoS' office
 Added hammer and gavel to the courtroom
 Updated a lot of item paths - banana pies, brig door timers, most pets, and roundstart secure lab slimes
 Updated syndicate shuttle, station, and CentCom to current Boxstation versions
 Improved NT recovery shuttle (white ship) - it can now dock at mining, has a transit effect, and a slightly altered central room
 Removed non-functional gun charger from the shuttle bridge
 Rearranged robotics to give it more open space
 Rearranged R&D slightly, removed incorrect "mineral storeroom" designation
 Rearranged lower chemistry machines to be more usable
 Replaced biohazard containment blast doors around toxins with shutters to stop obscuring open doors
 Replaced one of the newscasters in the chapel with a notice board
 Renamed chapel 'mortuary' to funeral parlour
 Fixed soulstone shard in chaplain's office being cult/wizard use only - now anyone can use it again
 Fixed not being able to hide behind plants
 Fixed ERT response room having incorrect map
 Fixed overlapping air alarm and fire alarm between showroom and gateway
 Fixed overlapping no smoking sign and alarm in R&D
 Fixed overlapping station intercom and map south of gateway
 Fixed vendors on recovery and emergency shuttle being depowered
 Fixed incorrect area designations in atmospherics
 Fixed duplicate science satchels in scientist lockers
 Fixed broken point redeemer consoles on the labour camp shuttle
2015-04-07 14:05:41 +01:00
phil235 e32a0b5b3e map fixes and adjusting max reagent volume for some foods. 2015-04-04 19:44:46 +02:00
phil235 22ff13eff8 Adding a whole bunch of food. 2015-04-04 02:35:48 +02:00
Jordie 57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
Cheridan 884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Fayrik 4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
phil235 7a1232012b Fixes more merge conflicts 2015-03-26 02:52:04 +01:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
WJohn 99b14399de Fixes a bunch more map issues!
Fixes #7923
Fixes #7876
Fixes #7747
Fixes #7664
Fixes #7612 (#8507 can be closed to prevent any possible conflicts)
Fixes #7372 if there was ever any issue to begin with
Fixes #7304
Fixes #6563
Adds the changes from #8515 (can be closed in case it tries to cause conflicts).
Also fixes bunches of areas and makes it a bit cleaner.

SPEED MERGE FOR THE LOVE OF GOD I DON'T WANT TO HAVE TO RESTART THIS SHIT 5 TIMES.
2015-03-24 15:53:30 -04:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Cheridan f180506a2d finished 2015-03-18 23:59:23 -05:00
MrPerson f6fa4ab1ed Fixes syndicate and mining shuttles colliding
Fixes #8220
Also removes an extra simulated turf on the wizard shuttle that the last mothafucka missed
2015-03-18 12:01:41 -07:00
Fayrik 2eb9fcc560 Fixed merge conflicts manually. (Again.) 2015-03-16 11:28:28 +00:00
Fayrik c1fce0448a Changes z2's centcom area to be a little more functional, making the checkpoint lead to an active area instead of a dead and, and adding a cargo bay to allow access to the cargo shuttle. 2015-03-16 10:59:43 +00:00
Cheridan da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
Code cleanup
2015-03-15 01:55:39 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
Cheridan f552aa0ce1 Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
MrPerson dd5e791cf7 Was this really necessary? Come on Metacide get your shit together. 2015-03-13 11:02:33 -07:00
Cheridan 61d656a173 Merge pull request #8253 from Jordie0608/mergeconflictsihavenoideawhatyouretalkingabout
Unhardcodes brig timers
2015-03-12 21:30:26 -05:00
Remie Richards d525fd6a87 Merge pull request #7872 from AnturK/hiss
Makes NPC queens/drones plant weeds/eggs
2015-03-09 14:27:55 +00:00
Jordie0608 6f318417fe unhardcodes brig timers 2015-03-09 19:28:22 +11:00
Incoming 9384d44ee5 Adds a magic mirror to the wizards shuttle. The magic mirror has greatly expanded functionality compared to the normal one, and can additionally change a wizards name, gender, race, hair color and eye color.
Additionally this fixes up some rogue simulated airless tiles on the wizards shuttle (these tiles were why the creature would always end up dead)
2015-03-08 04:24:04 -04:00
Cheridan 2940de38d4 Merge pull request #8108 from TheVekter/vodkasprite
Fixes the broken Badminka Vodka sprite
2015-03-06 10:53:45 -06:00
Cheridan e2554c55e6 Merge pull request #8147 from Cheridan/master
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
Cheridan 56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
Conflicts:
	code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
Ikarrus 88d19bccfc [Map] Shuffles Assistant Spawn Locations
Moved them about so they spawn in public lounging locations, instead of random hallways, dorm rooms and maint closets which IMO should be kept clear so they don't get in the way if they're AFK.
2015-03-02 20:35:58 -07:00
TheVekter 94712a8125 Fixes the broken Badminka Vodka sprite
Also moves the hidden bottle somewhere more... hidden.
2015-03-02 01:39:18 -06:00
Cheridan 9f62e2c387 Merge pull request #8055 from xxalpha/xxmas
Removes Santa Hats from security wardrobe closets and the festivus pole from RD's office.
2015-03-01 20:04:52 -06:00
Cheridan bbbf666c9a Merge pull request #8051 from xxalpha/surgeon_ops
Adds surgery table and tools to the Nuke Ops ship.
2015-03-01 19:53:19 -06:00
Razharas 245f661607 Merge pull request #7725 from Steelpoint/Derelict
[MAP] Derelict Update
2015-03-01 06:53:49 +03:00
xxalpha bdbbf2af62 Fix honk tiles in Nuke Ops base. 2015-03-01 00:34:12 +00:00
Remie Richards 736ffafa55 Merge branch 'master' of https://github.com/tgstation/-tg-station into BlobReroll
Conflicts:
	code/game/gamemodes/blob/blobs/blob_mobs.dm
	code/game/gamemodes/blob/blobs/core.dm
2015-03-01 00:18:19 +00:00
xxalpha 7859dd2fdf Removes Santa Hats from security wardrobe closets and other. 2015-02-28 01:01:19 +00:00
xxalpha 8fdccc2ff2 Adds surgery table and tools to the Syndicate Mothership medbay. 2015-02-27 23:56:30 +00:00
Metacide 783d3d29bc Updated MetaStation.v40D.dmm with addition of specific MetaStation/z3.dmm variant
-Added a firing range to research, made robotics/mech bay more compact
-Added a new NT recovery ship in deep space, which replaces most functionality of the white ship, the latter becoming an immobile derelict.
-Added protective gear and some more tables to the experimentation lab
-Added an extra airlock to space just east of the holodeck in maint
-Added more fruit variety to the garden
-Adjusted area designations so that emergency maintenance access works better
-Adjusted carp spawns - they're fewer and further away from the station
-Adjusted layout of xenobiology to make it look a little better
-Fixed missing disposals pipe and scrubber outlet in virology
-Fixed missing privacy shutters in medbay examination rooms
-Fixed missing target control in security's firing range
-Fixed missing tables in telecomms
-Fixed missing law office shutters
-Fixed extra glass stack on floor of engineering
-Fixed some cargo conveyor units being assigned to the wrong control stick
-Fixed extra corner pipe under manifold in the incinerator room
-Fixed invisible chairs at the arrivals lounge
-Fixed left cryo tube appearing under the window behind it when open
-Changed access level of space airlock adjacent to security pod to security only
-Includes soda and booze dispenser additions to the bar, courtesy of Mandurrrh
-Includes modifiable bar sign, also courtesy of Mandurrrh
2015-02-23 16:43:39 +00:00
AnturK fb2912146f Adds plants_flag, sets moonoutpost aliens to use it 2015-02-22 19:19:31 +01:00
Steelpoint 622b49e1c5 AddedRoughedUpTilesToSolarArrays 2015-02-22 23:27:54 +08:00