Commit Graph
1602 Commits
Author SHA1 Message Date
SinTwoandEmperorJon 5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Anewbe 22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Anewbe 7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax 5d6e129ebf Adjusts HoS' locker capacity 2016-04-28 21:37:57 +01:00
Datraen 45f97f2a45 Merge pull request #1491 from Hubblenaut/morgue
Morgue Trays interface with occupant minds
2016-04-27 20:49:15 -04:00
Hubblenaut c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
mwerezak 4951790b50 Fixes missing cooldowns, missing cult blade sound.
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
Neerti 554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Nerezza 24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Kelenius 98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
EmperorJon 482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100 2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
Hubblenaut e41ad0c946 Reinforced Walls
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
2016-04-15 16:41:33 +02:00
Neerti 25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Datraen e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
Datraen 459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Mark9013100 f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100 d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Mark9013100 1522026190 Detectives now spawn with CSI Kit 2016-03-30 11:50:54 -04:00
Neerti 015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes
Map fixes, minor edits
2016-03-30 02:25:35 -04:00
Neerti e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs
Adds Navy Blue scrubs
2016-03-30 02:24:07 -04:00
Mark9013100 50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
redstryker 7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Mark9013100 f57eef764f Bedsheets can be worn as capes 2016-03-28 22:01:37 -04:00
Mark9013100 26358bf1ab Map edits, minor fixes 2016-03-28 00:02:20 -04:00
Neerti 0844d0b9f0 Merge pull request #1239 from Mark9013100/3/23/2016layering
Layering fixes for bedsheets/curtains
2016-03-26 17:06:54 -04:00
SinTwo b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Mark9013100 200057397a Layering fixes for bedsheets/curtains 2016-03-23 16:19:41 -04:00
Neerti a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Datraen 996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Mark9013100 a8d90003ca Ports /tg/'s warden locker sprite 2016-03-15 06:49:25 -04:00
Yoshax 8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Neerti ccb6f5bd60 Merge pull request #1132 from Hubblenaut/laundry
Laundry Basket
2016-03-14 08:40:43 -04:00
Yoshax d64bfb3235 Actually fixes the underwear wardrobe 2016-03-12 02:22:34 +00:00
Yoshax ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
Yoshax b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Datraen addbfe11d5 Merge pull request #1153 from Hubblenaut/windowverbs
Window Verb Fix
2016-03-10 15:23:12 -05:00
Hubblenaut c7c5e22717 verb shows on playermade windows 2016-03-10 17:06:09 +01:00
Hubblenaut 51a6241fdd Merge remote-tracking branch 'upstream/master' into laundry 2016-03-09 15:56:16 +01:00
Neerti 7b9f011d10 Merge pull request #1135 from Mark9013100/3/8/2016clothinglockeredits
Adds departmental bags to wardrobes
2016-03-08 21:10:37 -05:00
Mark9013100 bba0d7e786 Adds departmental bags to wardrobes 2016-03-08 16:37:30 -05:00
Hubblenaut f122902b84 Adds laundry basket
Conflicts:
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
2016-03-07 20:28:41 +01:00
Hubblenaut 49d7f0ee3b Window verbs update, wrench noise on dismantling 2016-03-07 19:12:59 +01:00
Neerti b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove
Removes xenormorphs.
2016-03-04 12:34:13 -05:00
Neerti 6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
Kelenius b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Hubblenaut c22f9b2996 Merge remote-tracking branch 'upstream/master' into cash 2016-02-21 17:48:19 +01:00
Datraen f9054370c1 Merge pull request #1046 from Sabess/Sab_Thing
Maglights 2.0: Conflict Boogaloo
2016-02-21 11:30:34 -05:00