Commit Graph

834 Commits

Author SHA1 Message Date
Cheridan 46ce3fe0d9 Merge pull request #10214 from nukeop/fridge
Move the chemistry fridge between the front desks
2015-06-28 18:29:32 -05:00
Ikarrus 8c62ccfe2e Moves clothes from out of equipment lockers and into wardrobe closets
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
barackobama 5128873bc6 move the chemistry fridge between the front desk 2015-06-27 23:57:23 +01:00
Cheridan b9cdb3384a Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
phil235 ee13658752 Merge pull request #10018 from pudl/sam
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
TheVekter ea79a2ad72 Removed sec console, moved around stuff and added corgi crate. 2015-06-24 22:57:21 -05:00
TheVekter 03222d2355 Fixes #10120 2015-06-24 15:21:43 -05:00
Jordie0608 58399f7602 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/items.dmi
2015-06-24 20:31:51 +10:00
KyrahAbattoir a00eded5b7 -Glass to glass structure spawner.
-Moved a pipe under a window rather than a wall (ez-er access)
-Fixed the cook not having a toundstart spawn point.
2015-06-23 02:44:39 +02:00
Cheridan 05f65f04b8 Merge pull request #9866 from Xhuis/revenants
Revenant Rework (NOW WITH LESS CLOSING)
2015-06-20 13:24:02 -05:00
Jordie0608 c479b08a39 missed path 2015-06-20 18:41:29 +10:00
Jordie0608 538d4ad303 Merge branch 'master' of https://github.com/tgstation/-tg-station into glassisapaintosprite
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
2015-06-20 18:37:39 +10:00
Jordie0608 25445e5a05 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-06-20 17:32:16 +10:00
Cheridan c1158e5292 Merge pull request #10028 from Incoming5643/X_gonna_give_it_to_you
Fixes a missing roboticists spawn on box
2015-06-20 00:39:24 -05:00
Incoming 316023189d Fixes a missing robotocists spawn on box. 2015-06-18 13:38:24 -04:00
Xhuis ad3f81f88d Custom spawn points and reforming ectoplasm 2015-06-18 13:18:53 -04:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
phil235 a372b6ffc7 Merge pull request #9940 from Ikarrus/deptmanagement
[Boxstation Edit] Department Management Console
2015-06-17 19:46:44 +02:00
Thunder12345 36ef683f94 Fixed metastation 2015-06-17 16:43:23 +01:00
pudl 58b436fe1f adds abandoned crates to code, adds crate spawners to code, distributes crate spawners across maps 2015-06-17 09:07:28 -05:00
WJohn 88a053a6c0 Merge pull request #9852 from pudl/salem
MiniStation Aesthetic Overhaul
2015-06-15 09:46:38 -04:00
Ikarrus 75a311dc8c Department Management Console
Originally conceived to manage budgets that can be used to buy things from cargo without their approval. But now it's just a limited ID console, but available in every Command Staffer's office.

- Can only modify access to their own department, regardless of what ID is used to log in
- Any department head can use these to promote/demote those in their department, including those who have access that you clearly do not remember authorizing
- Can be modified to change the access of other departments by using a multitool on the circuit board.
2015-06-13 12:55:24 -06:00
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
pudl 1329d5acb5 several minor fixes, mostly icon state and turf related 2015-06-08 19:21:57 -05:00
pudl 817341cd09 updates the ministation map to a much nicer aesthetic 2015-06-08 18:58:55 -05:00
Aranclanos a07024d469 Fixes the area of the security pod 2015-06-08 05:29:41 -03:00
Cheridan 389007d85d Merge pull request #9822 from kyrahabattoir/Ministation-stuff-part3
[Ministation] Cleaned up all the remaining vents & scrubbers that use…
2015-06-07 21:37:20 -05:00
Cheridan 66c7ea6635 Merge pull request #9675 from Jordie0608/equalrightsforcrewinaimodules
Resolves #4400, moves protectstation module on meta
2015-06-07 16:52:53 -05:00
KyrahAbattoir c8195b5181 [Ministation] Cleaned up all the remaining vents & scrubbers that used invalid icon states, rebuilt the engine pipework so that they use the right pipe types, rebuilt toxins research burn chamber piping. 2015-06-07 00:44:38 +02:00
Cheridan f874d23516 Merge pull request #9781 from kyrahabattoir/Ministation-glass-part2
[MiniStation] Bunchafix edition volume 1
2015-06-06 13:03:04 -05:00
Jordie0608 522b6e1ae5 moves protectstation module to highrisk table 2015-06-06 16:41:39 +10:00
Cheridan 12503d403a Merge pull request #9785 from CorruptComputer/BoxFixes
BoxStation Fixes
2015-06-05 10:11:55 -05:00
KyrahAbattoir 7c22b7a0b6 replaced rglass in bar hydroponics cargo waiting line & common room (interiors) by normal glass.
fixed electrification of bridge windows.
fixed bridge blast shutter iconstates.
reordered wires on security's electrified glass for clarity
replaced glass in sec, command, waste, cargo, detective
replaced rglass in common areas by regular glass.
cleaned up vars on vents & scrubbers in arrival/escape,dorm
rooms,cargo,sec,command,detective, custodial closet, eva,bar.
turned on the waste air injector & replaced connector ports in the atmo maint by "visible" ones.
reattached the cell timer panels to their respective walls.
replaced locker for cell "3" by cell "2"
2015-06-05 09:49:02 +02:00
CorruptComputer f830fed66b Turbine Door 2015-06-04 15:44:22 -05:00
CorruptComputer e1b18633d1 Fixed the stacked heater+freezer 2015-06-04 14:37:11 -05:00
CorruptComputer e3d075eac3 Moved camera console over 1 tile 2015-06-04 12:40:15 -05:00
CorruptComputer 736fd1b19c Fixed pipe 2015-06-04 12:00:46 -05:00
CorruptComputer 38ea7a4269 Fixes 2015-06-04 09:55:56 -05:00
Cheridan 5679d7fa52 Merge pull request #9684 from Xhuis/aiUploadFix
Fixes the AI upload having no cameras
2015-06-03 23:38:55 -05:00
KyrahAbattoir 37fe5e666a Conversion to whole tile glass part 1: engineering,comms,arrival 2015-06-03 03:42:47 +02:00
KyrahAbattoir 1b8a9af8de Ministation z2 and z4 updated for "unsimulated is kill" 2015-06-03 01:43:06 +02:00
Cheridan 662abd849c Merge pull request #9755 from kyrahabattoir/ministation-tcom-fix
Ministation: fixed tcoms
2015-06-02 16:06:40 -05:00
Cheridan bcdf74670f DAMAGE CONTROOOOOOOOOL 2015-06-02 15:43:39 -05:00
KyrahAbattoir e9cce952ea Ministation: fixed tcoms 2015-06-02 21:37:33 +02:00
Aranclanos dea72572c1 Created a new path of turfs, /turf/indestructible, they are only walls, turfs that are non interactive and static, like the splash screen or the borders of the different spawn spots of centcomm Z level (like wizard or nuke ops)
Fixes a few dirs of turfs in centcomm
2015-06-02 14:38:55 -03:00
Aranclanos e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Xhuis 062101e0f0 Fixes the AI upload having no cameras 2015-05-28 17:18:23 -04:00
Cheridan 909fcdc9a5 Merge pull request #9681 from kyrahabattoir/ministation-fixes
Removed duplicate pipes
2015-05-28 15:03:24 -05:00
KyrahAbattoir 10bd7c8e73 Removed duplicate pipes 2015-05-28 20:49:15 +02:00
duncathan 8c734b2ed5 fixes file paths on meta and mini 2015-05-27 19:57:22 -06:00