535 Commits

Author	SHA1	Message	Date
GinjaNinja32	4091bcf7b3	Change selection interface to have cancel button	2014-06-02 15:39:43 +01:00
GinjaNinja32	0f59d78c84	Added mechanism to change barsign design, so bartenders aren't stuck with whatever the RNG picks.	2014-06-02 08:27:13 +01:00
Zuhayr	1e135f91af	Merge resolution with master.	2014-06-02 12:05:12 +09:30
mwerezak	2ad2be668f	Cleaner implementation of secure electronics	2014-05-30 20:07:20 -04:00
mwerezak	07d8a1442a	Adds secure airlock electronics ... Also, secured_wires can be set through the airlock constructor.	2014-05-30 19:38:35 -04:00
Hubblenaut	b54bc552e7	Personal closets are resettable with verb 'Reset Lock'	2014-05-20 01:25:06 +02:00
Mloc-Hibernia	e3a8d5eb43	Merge remote-tracking branch 'upstream/master' into dev ... Signed-off-by: Mloc-Hibernia <colmohici@gmail.com> Conflicts: code/game/objects/effects/spawners/bombspawner.dm	2014-05-11 13:19:09 +00:00
Zuhayr	4d64af69f4	Fixes #4923	2014-05-09 21:29:44 +09:30
Mloc-Argent	e1ddec4a73	Merge remote-tracking branch 'upstream/master' into dev ... Conflicts: code/game/area/Space Station 13 areas.dm code/game/objects/items/weapons/manuals.dm code/modules/mob/living/say.dm code/modules/organs/organ_internal.dm code/modules/paperwork/paper.dm code/modules/supermatter/supermatter.dm html/changelog.html icons/mob/uniform.dmi Signed-off-by: Mloc-Argent <colmohici@gmail.com>	2014-05-03 16:56:19 +01:00
Ravensdale	b8696668a7	Fix for problem #2891	2014-04-30 08:20:44 -07:00
RavingManiac	96b7647039	Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.	2014-04-28 00:28:06 +08:00
Ccomp5950	976ae06e6b	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ... Conflicts: code/modules/mob/living/say.dm code/modules/paperwork/paper.dm code/modules/telesci/bscrystal.dm html/changelog.html icons/mob/uniform.dmi maps/tgstation2.dmm	2014-04-25 21:14:58 -05:00
RavingManiac	4fd01c2384	Shuttle windows replaced with reskinned reinforced glass windows. Number of doors into cockpit reduced to 1. ... Fitness room rearranged to make more sense, with glass around pool.	2014-04-20 22:35:59 +08:00
Ravensdale	68eda5201b	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron ... Conflicts: code/ATMOSPHERICS/components/unary/vent_scrubber.dm code/modules/paperwork/paper.dm html/changelog.html icons/mob/uniform.dmi maps/tgstation2.dmm	2014-04-16 21:44:26 -07:00
Ravensdale	1d6655850f	Changes all appropriate instances of toxins to phoron	2014-04-10 15:11:26 -07:00
Ravensdale	a3e4a43536	Changes most viable, used entries of plasma with phoron.	2014-04-10 05:05:04 -07:00
Ravensdale	e6c3fbf071	Changes all appropriate instances of 'Plasma' to 'Phoron'	2014-04-10 01:19:49 -07:00
Chinsky	06fd99b9ba	Merge pull request #4723 from Jarcolr/diction ... Fixes some typos and descriptions	2014-04-09 21:48:19 +04:00
Jarcolr	868dea5681	Grammar patch 1 ... This is just the first one of many.	2014-04-08 14:48:31 +03:00
RavingManiac	ac9d37261f	Check restricted to closets and storage items due to lag concerns.	2014-04-07 20:45:05 +08:00
Chinsky	4ee7569858	Merge pull request #4694 from mwerezak/master ... Fixes #4689, #4680	2014-04-06 22:12:08 +04:00
Chinsky	5300508fc2	Merge pull request #4702 from Jarcolr/patch-2 ... Kicking a grille does 2 less damage; fix for #4557	2014-04-06 22:11:43 +04:00
Jarcolr	a3bf9733a2	Kicking a grille does 2 less damage; fix for #4557 ... It will now take 10 hits to destroy it without using a weapon or tools. Take that,metagamers!	2014-04-05 19:15:41 +03:00
Mloc	cd23a4b786	Merge pull request #4690 from Glloyd/ear_stuff_2 ... A first pass at more realistic w_class values	2014-04-05 16:23:59 +01:00
Mike	920a08412b	Fixes #4689 ... Rods can't break reinforced windows.	2014-04-05 00:38:48 -04:00
Ccomp5950	6f55b60120	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ... Conflicts: html/changelog.html	2014-04-04 01:14:31 -05:00
Graham Lloyd	72e45ebf7b	A first pass at more realistic w_class values	2014-04-03 17:54:06 -04:00
Chinsky	26007716e4	Merge pull request #4660 from Jarcolr/patch-2 ... Can no longer use fire extinguisher closet without hands	2014-04-01 16:23:18 +04:00
Jarcolr	231ecb6890	Cannot wash your missing hands anymore ... M as mob changed to user as mob; don't know why it was shortened to 1 letter,but eh.	2014-03-31 21:13:26 +03:00
Jarcolr	cf42e348f0	Can no longer use fire extinguisher closet without hands ... If you did not have hands,you could click on a emergency closet and have it spawn in your hand,and it would stay there,floating. Cool,right?	2014-03-31 18:19:25 +03:00
RavingManiac	b8e27c1347	Missing files added.	2014-03-30 21:51:20 +08:00
Graham Lloyd	b6f2d39f6b	3d Sound from /tg/	2014-03-27 14:49:49 -04:00
Mloc-Hibernia	dc97a2502a	Revert "Merge pull request #4607 from Aryn/master" ... This reverts commit a1fee3e6c3, reversing changes made to bf4533efde.	2014-03-24 13:54:11 +00:00
RKF45	5d6f425dd4	Removal of bees	2014-03-22 18:45:28 +01:00
Aryn	1b8dc12a7c	I think I fixed everything it is possible to stuff a light source into.	2014-03-19 01:02:27 -06:00
Chinsky	5ed6e58430	Readded welder backpack.	2014-03-11 02:06:30 +04:00
Ccomp5950	39383c331a	Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev	2014-02-26 09:38:40 -06:00
Ccomp5950	c56ec21ee3	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ... Conflicts: code/modules/reagents/Chemistry-Reagents.dm	2014-02-26 09:34:38 -06:00
Segrain	ef3b565f64	Fix for #4458.	2014-02-22 06:53:37 +03:00
Ccomp5950	b6eacfe385	Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev ... Conflicts: code/modules/admin/verbs/mapping.dm	2014-02-20 19:23:16 -06:00
Ccomp5950	63a0f1185e	Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ... Conflicts: code/ATMOSPHERICS/pipes.dm code/game/dna/genes/powers.dm code/game/objects/items/devices/PDA/PDA.dm	2014-02-20 19:16:23 -06:00
Loganbacca	da3d82c1de	Closet fixes ... - Fixed a few closets not adding items to their contents at round start (wardrobes have the same issue, but I've already fixed them on master)	2014-02-20 17:54:27 +13:00
Aryn	a2d992ef5c	Fixed inexplicable reversions.	2014-02-19 17:11:09 -07:00
Loganbacca	b8b1bd82a4	Wardrobe fix ... Fixes #4447 - Added a parent call to each wardrobe subtypes New() proc. Wardrobes weren't calling obj/structure/closet/New(), so weren't adding items in the same location to their contents when first created. - Removed wardrobe/New() proc. So all subtypes don't inherit an extra set of blue uniforms and brown shoes. Only one wardrobe on the map is of this type, and it's on the derelict, so didn't think it was worth making a map change.	2014-02-18 11:12:27 +13:00
Loganbacca	4b1bb13ace	Crate and closet updates ... - Added atmos themed sprite for atmospheric technician secure closets - Added a second radiation suit to radiation suit closets - Added a solar pack crate (because adding crates to the map with this many objects manually is silly)	2014-02-08 18:35:13 +13:00
RavingManiac	30915b5ba4	Escape shuttle modified after feedback. ... Wall emergency lockers now contain two breath masks and two emergency oxygen tanks. Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.	2014-02-02 16:04:11 +08:00
RKF45	8fbcda2a0b	Reintroducing the dough-based cooking system.	2014-02-01 02:17:38 +01:00
suethecake	6f69e7f821	Stuff.	2014-01-29 18:15:35 -06:00
Ccomp5950	283df26fa7	Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev	2014-01-23 00:19:01 -06:00
Ccomp5950	c028db481e	Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ... Conflicts: code/modules/mob/living/carbon/monkey/diona.dm code/modules/reagents/Chemistry-Machinery.dm	2014-01-23 00:05:53 -06:00