Commit Graph

42 Commits

Author SHA1 Message Date
Anewbe
40075a319a Merge pull request #3806 from ghost/woodbuck
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
Woodratt
3e90725a45 Catwalks and Railings
Added catwalks and railings. Ported from Vorestation who ported them from Eris.

Note, catwalks can be placed on plating (as is seen on the vorestation map Tether) and is done so here as well. However it doesn't seem like it is possible to build said catwalks on plating. Did not bother to adjust this at this time. Something to sort in the future.

Adjusted SC station dmm to use both the railing and catwalks as well as a couple fixes for the floor tile adjustment in a earlier commit.
2017-09-16 00:54:33 -07:00
Belsima
eb341aaa65 Adds wooden buckets, craftable with botany. 2017-09-09 17:16:34 -04:00
Woodratt
0bd91d1133 Floor tile, type and carpet change
- Ports the floor types, structure, and sprites (techfloor) from Vorestation (who ported them from Eris).
- Fixed missing techfloor floortile sprite icons (ported from Eris).
- No actual new floor sprites sans the techfloor. Saving for when we actually change maps to do that.
- In theory, also added a changelog for what I'm doing. Not sure if worked.
2017-08-28 23:00:15 -07:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Anewbe
6a99123f51 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-10 11:26:09 -05:00
Anewbe
27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -05:00
Anewbe
f284970358 Adds craftable whetstones, changelog 2017-03-28 23:50:21 -05:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Neerti
b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Yoshax
102c0c2277 Makes clipboards producible out of wood 2016-11-12 01:26:20 +00:00
SinTwo
a7aa2a7f33 makes benches a subtype of tables 2016-06-29 17:52:27 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828)
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
2016-05-31 15:08:57 +01:00
SinTwo
b356f5cf21 Construction Update 2016-03-25 16:02:36 -04:00
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
sabess
a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
sabess
1bf719f20f Fixed brass knuckles; only possible to get them from steel now. 2015-12-14 16:38:05 +11:00
sabess
966048c0ad Adds brass knuckles. 2015-12-14 15:57:48 +11:00
Zuhayr
d5447d9e95 Fixes #10838 2015-12-10 10:23:49 +10:30
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Woodrat
c192378bab Woodrat Work v8.2
- Placed missing metal and glass from R&D back into R&D.
- Fixed a broken scrubber pipe on the research outpost catwalk.
- Mining and Research Outpost power issues should not be as major right off the bat. In theory should at least last half the round? Further testing needed.
- Discovery about research and mining elevators made. Filled in more asteroid turf around both, added lights to both.
- Wrong tile used in port security maintenance fixed.
- Second camera added to the AI core cause Koco is a dum dum.
- New door sprites and new door. Mixture between atmos and engieering doors, dual access. Placed on the monitoring room behind the front desk.
- Fixed Filter to phoron on the mining engineering outpost.
- Mining engineering outpost fully camera'd
- Lattice added to underneath heat exchange pipes and around the engine heat exchange pipes.
- Complete and total overhaul of the mining outpost.
- Re-removed the RCD from the industrial hardsuit.
- Blue flags created.
- One blue flag and one red flag added to the laser tag lockers.
2015-08-22 12:33:27 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
Kelenius
aa318b8d1c Merge branch 'dev' into ofBeesAndHoney
Conflicts:
	code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
Chinsky
3b500d4076 Merge pull request #10279 from Kearel/LibraryModifications
Library modifications
2015-08-13 17:47:16 +03:00
Kelenius
65a9e11a52 Merge branch 'dev' into ofBeesAndHoney
Conflicts:
	baystation12.dme
2015-08-13 08:33:46 +03:00
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
2015-08-12 15:54:16 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name
Gives the hydro soil recipe a name that better conveys it's purpose.
2015-08-12 15:25:01 -04:00
Kearel
94df140755 Library changes
-Added ability to build/dismantle book shelves using wood or a
screwdriver, respectively.
-Added ability to move book shelves using a wrench.
-Added buttons to library computer to help sort the list of books
available.
2015-07-23 23:48:26 -05:00
Zuhayr
550ea5f127 Fixes #9740 2015-07-09 03:40:26 +09:30
Kelenius
876dde550a Beekeeping: spans, sprites, wood recipes, fixes 2015-07-08 12:55:55 +03:00
Zuhayr
8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
mwerezak
9d7a1b9ad6 Fixes misleading path and proc name 2015-06-26 00:40:31 -04:00
Atlantis
41d4c2eb13 Refactors /obj/item/apc_frame to /obj/item/frame/apc
- This fixes broken APC frame placement on walls - #9537
2015-06-07 06:26:10 +02:00
Zuhayr
8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
Zuhayr
14df1e5fb5 Converts beds, chairs and stools. 2015-05-17 03:43:59 +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