Commit Graph

692 Commits

Author SHA1 Message Date
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
Steelpoint 622b49e1c5 AddedRoughedUpTilesToSolarArrays 2015-02-22 23:27:54 +08:00
Steelpoint b826f1a5eb RemoveShuttle 2015-02-22 23:14:50 +08:00
TheVekter a1cd122d95 Revert "Extends the cargo conveyor belts into a sushi-style loop" 2015-02-21 17:53:21 -06:00
TheVekter 16b71c7fde Merge branch 'master' of https://github.com/tgstation/-tg-station into cargobelts
Conflicts:
	icons/turf/floors.dmi
2015-02-21 14:49:03 -06:00
TheVekter c75f38ee19 Extends the cargo conveyor belts into a more user-friendly configuration. 2015-02-21 14:41:45 -06:00
Swag McYolosteinen b4a1594810 Merge pull request #7797 from Mandurrrh/Barsigntaketwo
Adds interchangeable bar signs and a variety of choices.
2015-02-20 19:34:49 +01:00
Mandurrrh 1301fdd9ab Fixes maps, adds emp barsign, fixes merge conflicts. 2015-02-20 12:08:04 -05:00
Mandurrrh 7fbf0a261b mergeconflictfix 2015-02-20 09:06:04 -05:00
Razharas 452aa3d961 Merge pull request #7791 from Mandurrrh/Booze
Adds fountain machines for bar.
2015-02-20 09:19:42 +03:00
TheVekter 438cfb5b56 Left a testing aid in place, whoops. 2015-02-18 23:20:38 -06:00
TheVekter d66455bcd9 Adds the new Nuke to the Vault.
* Adds some new floor designs as well, which will be implemented for future fuckery
2015-02-18 23:03:51 -06:00
Steelpoint 8caabe4d9a Saved 2015-02-18 12:48:28 +08:00
Steelpoint 53e698c701 Merge branch 'master' of https://github.com/tgstation/-tg-station into Derelict 2015-02-18 12:47:28 +08:00
Mandurrrh 6d23db48d4 This is a combination of 7 commits.
Adds fountain machines for bar.

Changed soda to drink updated code/mappaths
2015-02-17 19:14:41 -05:00
Steelpoint dd27e73da7 NewAreas 2015-02-16 18:40:43 +08:00
Metacide c12e7d2e94 Updated MetaStation/z2.dmm
-Fixed mushroom pizza causing compile fail.
-Updated station map on wall of nuke-op staging point to MetaStation's own map.
2015-02-15 14:44:06 +00:00
Metacide 66f21d8861 Updated MetaStation.v40B.dmm to MetaStation.v40C.dmm
-Also updated MetaStation/z2.dmm
-Added missing drinks showcase to the bar.
-Added missing slot machines to the casino.
-Added missing maintenance loot spawners throughout maintenance.
-Added missing intelliCard to RD office.
-Added missing atmospheric technician lockers to atmospherics.
-Added missing Janicart and Secway to the custodial closet and brig, respectively.
-Added missing blast doors under cell windows in xenobiology.
-Added missing blast doors under windows around the HoS' office.
-Added a drinks shaker to the Captain's quarters.
-Added more department direction signs.
-Added vendomat and slot machine to the ghetto bar.
-Added a variety of winter coats to dorms and one to each department that has a sprite.
-Added a zippo lighter, and cigarette and coffee vendors, to the council room.
-Switched direction of conveyer-belts in cargo bay for easier tagging and mailing of ordered crates.
-Fixed lack of security batons in brig security lockers - they are intentionally absent from departmental lockers.
-Fixed chapel shutters not working.
-Fixed a few instances of incorrectly empty medkits on roundstart.
-Fixed a missing disposals pipe in the brig control room.
-Fixed tiles in the south-west of the central hallway incorrectly being area-designated as space.
-Renamed telescience lab to experimentation lab
-Other minor alterations
2015-02-15 14:10:32 +00:00
Steelpoint 975066e9c9 MoreBroken 2015-02-14 22:40:23 +08:00
Steelpoint c134f0df8a BlownUpGravGen 2015-02-14 22:26:50 +08:00
Steelpoint 7c691cd1ce DerelictUpdate 2015-02-14 21:58:50 +08:00
Cheridan 585298ef33 Merge pull request #7557 from paprka/minormeds
Gave miners a brute patch at roundstart and some more appropriate medkits
2015-02-12 11:47:27 -06:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
2015-02-12 08:01:17 -06:00
Cheridan 961234003a Merge pull request #7648 from Menshin/asteroid_pipes_fix
Removed strangely unnoticed pipes in asteroid.
2015-02-11 20:55:07 -06:00
phil235 549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
TheVekter 666d3203f1 Revert "Mapping is hard" 2015-02-10 17:00:50 -06:00
TheVekter 9a51b18cf9 Mapping is hard 2015-02-10 16:45:21 -06:00
Menshin 3587be0c17 Removed strangely unnoticed pipes in asteroid. 2015-02-10 19:43:52 +01:00
TheVekter 5cc6371217 Merge branch 'master' of https://github.com/tgstation/-tg-station into shotglasseshowdotheywork 2015-02-10 12:06:04 -06:00
TheVekter 2b346676c1 Moved shotglasses back to drinkingglass.dm. Again.
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
2015-02-10 11:50:28 -06:00
Swag McYolosteinen 6dda0152db Merge pull request #7576 from paprka/janikort
Fixes janitors spawning without keys and readds the janicart + secway to map
2015-02-10 17:48:41 +01:00
Swag McYolosteinen ec205e6674 Merge pull request #7605 from pudl/peaceout
removes efficiency station from code
2015-02-10 17:45:03 +01:00
TheVekter f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within.
Re-adds bottle of booze that got removed in a merge conflict a while back.
2015-02-09 18:25:03 -06:00
TheVekter e728185a49 Fixes shot glass sprite changing when something's poured in (TEMP FIX) 2015-02-09 16:55:11 -06:00
Cheridan bb78766800 Merge pull request #7596 from paprka/terribleterrible
Fixes ERT ion rifle and z2 floating areas
2015-02-09 09:02:47 -06:00
phil235 c70d17a8eb Rebalancing vitamin amounts in grown
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
2015-02-08 22:48:53 +01:00
Metacide 6116dfaa07 Updated MetaStation.v40B.dmm and z2.dmm
-Updated tequila path so map compiles again
2015-02-08 02:34:39 +00:00
pudl 7697429dfd removes efficiency station from code 2015-02-07 17:26:51 -06:00