mwerezak
02dafb3c71
Adds a bunch of traps to the skipjack equipment
2015-05-24 16:44:35 -04:00
PsiOmega
a294ce9128
Adds additional missing materials:
...
EVA again has:
3x50 sheets of steel.
1x10 sheets of plasteel
1x50 sheets of glass
1x50 sheets of reinforced glass.
Robotics again has:
5x50 sheets of metal.
1x20 sheets of glass.
1x10 sheets of plasteel.
Cargo again has:
1x50 sheets of metal.
1x50 sheets of glass.
2015-05-23 12:49:58 +02:00
PsiOmega
3837e67f70
Fixes #9054 .
...
Seeing how xenobiology is separated from the rest of the station, the Research disposal unit now leaves its goods in the main research hallway.
2015-05-22 11:40:57 +02:00
PsiOmega
38fbe15f5a
Fixes #9265 .
...
Now either engineering or atmos techs can utilize the windoors.
2015-05-22 09:47:52 +02:00
PsiOmega
3d12ad3ab0
Fixes #9359 .
...
While I'm at it.
2015-05-22 09:44:27 +02:00
PsiOmega
e9abad5c70
Restores missing materiel in engineering.
...
The engineering workshop now again contains:
3 sheets of steel, 50 units ea.
3 sheets of glass, 50 units ea.
3 sheets of plasteel, 10 units ea.
1 sheet of plastic, 20 units.
2015-05-22 09:41:07 +02:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
8e5f5ef8e0
Merge pull request #9165 from Yoshax/trapping
...
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
Zuhayr
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
Zuhayr
a540e97e1b
Stool and table tweaks, adjusted tables on the map.
2015-05-17 13:41:22 +09:30
Zuhayr
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
Zuhayr
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
Zuhayr
8f6666a32e
Converted barricades to material system.
2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
Zuhayr
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
Zuhayr
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
Zuhayr
e1a14e3c41
Removes xenoarch reconstitutors entirely. "Fixes" #5413
2015-05-16 17:40:49 +09:30
GinjaNinja32
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
PsiOmegaDelta
38eb1ad7b9
Merge pull request #9263 from Hubblenaut/dev
...
Cleans up access and map artifacts
2015-05-16 09:33:11 +02:00
Hubblenaut
f9cbf1a1fd
Cleans up access and map artifacts
2015-05-15 15:36:48 +02:00
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
Atlantiscze
17bfbd911b
Fixes missing cable near mining outpost
2015-05-15 01:39:24 +02:00
GinjaNinja32
21394e78c4
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-15 00:12:40 +01:00
Chinsky
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
Chinsky
a4285a0c72
Merge pull request #9243 from PsiOmegaDelta/Mapping
...
Fixes pipes on the asteroid disappearing into limbo.
2015-05-14 20:43:08 +03:00
PsiOmega
be02c74508
Makes use of the new pre-definer atmospheric tank vents on the engineering outpost.
2015-05-14 15:32:01 +02:00
PsiOmegaDelta
9ed8f69e02
Merge pull request #9240 from Techhead0/internalsBox
...
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
GinjaNinja32
fb329fb8e0
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-13 20:46:58 +01:00
GinjaNinja32
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
GinjaNinja32
f9f99d61b2
Map changes.
...
sed -rbi 's#obj/structure/table([^/])#obj/structure/table/standard\1#g' maps/**/*.dmm
2015-05-13 19:09:40 +01:00
PsiOmega
e92196c903
Fixes pipes on the asteroid disappearing into limbo.
2015-05-13 13:30:22 +02:00
Zuhayr
3c10cc5852
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems
2015-05-13 17:00:10 +09:30
Techhead0
93767c589e
Adds beanbag shells to bar backroom.
...
Also, fixes.
2015-05-13 03:30:07 -04:00
PsiOmega
ab6c4e74cb
Merge remote-tracking branch 'upstream/dev' into BrigGarbage
2015-05-12 19:06:56 +02:00
Zuhayr
c90bca5241
Merge pull request #9191 from Mark9013100/spacetoplate
...
Re-adds plating to locker room maintenance
2015-05-12 23:58:19 +09:30
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
PsiOmega
6bede81523
Map cleaning.
...
Fixes some issues with windoor definitions.
Cleans up windoor usage.
Fixes #9194 , making it more evident where the disposal unit sends its goods.
2015-05-12 14:24:27 +02:00
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
Mark9013100
443652bf68
Adds grilles
2015-05-11 17:27:20 -04:00
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
Mark9013100
63d4a2b64a
Re-adds plating to locker room maintenance
2015-05-11 04:50:36 -04:00
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Yoshax
b0d10a6508
Fixes some stuff (+2 squashed commit)
...
Squashed commit:
[f63e170] Removes unnecessary /
[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
Yoshax
86bf94ba07
Refactors bear traps
2015-05-10 20:09:29 +01:00
Mloc
18209f9d78
lighting map changes
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 17:06:29 +01:00
Zuhayr
c0bb92bf34
Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles
...
Station alarm monitor changes.
2015-05-10 15:37:50 +09:30
PsiOmegaDelta
3907e8bb3a
Merge pull request #9142 from Yoshax/mapstoof
...
Maps in practice shells to the armory.
2015-05-08 18:44:27 +02:00
