4d64af69f4
Fixes #4923
2014-05-09 21:29:44 +09:30
b8696668a7
Fix for problem #2891
2014-04-30 08:20:44 -07:00
96b7647039
Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.
2014-04-28 00:28:06 +08:00
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
06fd99b9ba
Merge pull request #4723 from Jarcolr/diction
...
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
868dea5681
Grammar patch 1
...
This is just the first one of many.
2014-04-08 14:48:31 +03:00
ac9d37261f
Check restricted to closets and storage items due to lag concerns.
2014-04-07 20:45:05 +08:00
4ee7569858
Merge pull request #4694 from mwerezak/master
...
Fixes #4689 , #4680
2014-04-06 22:12:08 +04:00
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
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
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
920a08412b
Fixes #4689
...
Rods can't break reinforced windows.
2014-04-05 00:38:48 -04:00
6f55b60120
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2014-04-04 01:14:31 -05:00
72e45ebf7b
A first pass at more realistic w_class values
2014-04-03 17:54:06 -04:00
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
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
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
b8e27c1347
Missing files added.
2014-03-30 21:51:20 +08:00
b6f2d39f6b
3d Sound from /tg/
2014-03-27 14:49:49 -04:00
dc97a2502a
Revert "Merge pull request #4607 from Aryn/master"
...
This reverts commit a1fee3e6c3bf4533efde
2014-03-24 13:54:11 +00:00
5d6f425dd4
Removal of bees
2014-03-22 18:45:28 +01:00
1b8dc12a7c
I think I fixed everything it is possible to stuff a light source into.
2014-03-19 01:02:27 -06:00
5ed6e58430
Readded welder backpack.
2014-03-11 02:06:30 +04:00
39383c331a
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-02-26 09:38:40 -06:00
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
ef3b565f64
Fix for #4458 .
2014-02-22 06:53:37 +03:00
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
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
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
a2d992ef5c
Fixed inexplicable reversions.
2014-02-19 17:11:09 -07:00
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
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
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
8fbcda2a0b
Reintroducing the dough-based cooking system.
2014-02-01 02:17:38 +01:00
6f69e7f821
Stuff.
2014-01-29 18:15:35 -06:00
283df26fa7
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
2014-01-23 00:19:01 -06:00
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
9d618b2a11
Update lattice.dm
...
allow lattices to exist on open space
2014-01-18 00:16:14 +01:00
682dfd5670
More typo fixes
...
Missed these in the last commit.
2014-01-15 20:03:12 +13:00
c83537a6a9
Sink filling typo
...
No more filling the the bucket using the sink.
2014-01-15 19:13:06 +13:00
76dc0c4c49
Merge pull request #4234 from Mloc/bs12-quicklist
...
[TG] Optimized and refactored list2text, text2list, and replacetext.
2014-01-10 11:55:33 -08:00
98f02be5a6
code/game/object/items/weapons/* lowercase pass
...
code/game/object/structure/* lowercase pass (start)
Conflicts:
code/game/objects/items/weapons/AI_modules.dm
code/game/objects/items/weapons/paint.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/vending_items.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/structures/bedsheet_bin.dm
code/game/objects/structures/door_assembly.dm
2014-01-08 19:56:00 +00:00
3b66f33d14
Fixes morgue trays used by ghosts and what not
2014-01-08 19:39:20 +00:00
2069a9e83c
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
Conflicts:
code/game/machinery/newscaster.dm
2014-01-08 19:26:10 +00:00
68ae21fac3
Optimized and refactored list2text, text2list, and replacetext.
...
Also fixed some grammar in the station blueprint code.
Conflicts:
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/uplinks.dm
code/modules/admin/verbs/debug.dm
code/modules/clothing/masks/gasmask.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/TextFilters.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/ai/say.dm
2014-01-08 11:41:51 +00:00
62893f80b6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-04 11:35:07 +10:30
f0563911cb
Fingerprints on showers and crayon graffiti.
...
fixes #4076
as well as admin request on crayons.
2014-01-02 20:26:14 -06:00
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
53c94f76bd
Merge pull request #4134 from comma/gunlocker
...
Adds gun cabinets - special snowflake secure closets.
2013-12-29 06:25:12 -08:00
e63d5c14a5
BYOND cannot into chain assignment
2013-12-29 17:52:56 +04:00
Zuhayr