592aacac6e
-Adds as many colored couches as there are comfy chairs
...
-Reclassifies current couch as "old couch," still buildable
-Fixes the directions on the corner couch sprite to rotate like it should
2019-06-01 05:48:26 -05:00
3248675fed
-Adds basic steel couches from Paradise.
...
-Adds icons for said couches.
-Adds recipes for couches (2 steel per couch).
2019-05-28 23:43:51 -05:00
7453cb8dce
Adding in a feeding pump! With this you can feed someone liquids automatic while you snuggle and bully them!
2019-02-21 13:47:57 +01:00
c440277063
Add sap to trees.
...
Trees can now be used to produce sap. At least, the sif ones. The glowy ones.
There is 3 different tree types and 3 associated saps types.
They can be used for some minor chemistry but nothing too cool for now.
The tree taps can be crafted with a bit of metal.
2019-01-16 18:31:05 +01:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
917c7b71a5
Box of Things for Events and the Future MK1 ( #5281 )
...
* Lots of Stuff for Events
* Adds changelog.
* Review & QOL
2018-05-25 16:26:31 -07:00
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
759bec84d0
Nerf marble
...
Please.
2018-04-19 02:36:02 -04:00
88c1a7d845
Fixes borg synth sheet naming when depleted to 1
...
-The thing changing the sheet stack names to singular/plural no longer breaks the naming for borg sheet synthesizers.
2018-04-18 16:07:36 +03:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
5dc7189cf7
Various Loot Pile and Dungeon objects Stage Uno ( #4975 )
...
* Loot Piles
* Mecha Loot Piles, Random Tool Spawners
* Fix Random Spawners, don't use Fiftyspawners
Fix Fiftyspawners
2018-02-28 11:18:44 -06:00
3fe17274d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/ATMOSPHERICS/pipes.dm
# code/game/turfs/flooring/flooring.dm
# code/modules/clothing/clothing_accessories.dm
# code/modules/mob/living/carbon/human/inventory.dm
# html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
f49b1a9ad2
Adds ice puzzle POIs ( #4963 )
...
* adds slippery ice tiles
* adds ice puzzle POIs
also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
c7fdd099b6
Flooring fixes
...
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.
Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
2018-02-24 15:31:10 -06:00
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
5486edf567
Adds various cabin-related things. ( #4888 )
...
* adds fireplace, makes bonfire generate heat
kinda, anyways
* adds sifwood tiles, fixes old blue carpets
old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.
* lets you dig up tree stumps with shovels
* changelogs in the house
* adds a delay to digging up stumps
digging up stumps is easier said than done
2018-02-21 15:45:01 -06:00
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
f5dfbff1bd
Build igloos and snowmen ( #4811 )
...
* adds packed snow brick material
* makes snow walls spawnable for mapping
* adds snowmen
craft them with snow. duh.
* snow spider triggers arachnophobia
also changelog.
2018-02-15 14:25:51 -06:00
b4b9cea362
Make light switches constructable
...
Adds constructable light switches using Brown's construction stage icons.
2018-02-14 21:26:00 -05:00
7da5da69eb
Tweaks Lead & Radiation Resistance
2018-02-12 07:10:26 -05:00
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
cee3066a41
RUST additions and updates, Modular guns, and Lead. ( #4667 )
...
* expanding rupture procs
adds hydromagnetic traps for power production.
* Minor tweaks.
* Adds modular guns using research components.
* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.
* Un-zeros stock material radiation resistance.
* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.
* Map muckery?
* absolute pathing i guess?
* getting angry, travis.
* TRAVIS
STAHP
* I...
Comments? Lists? Who the hell knows.
2018-02-04 18:04:28 -06:00
4f98fad36b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
...
# Conflicts:
# .travis.yml
# code/_away_mission_tests.dm
# code/modules/admin/verbs/mapping.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z10.png
# nano/images/nanomap_z2.png
# nano/images/nanomap_z3.png
# nano/images/nanomap_z5.png
# nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
e9886625fa
Adds Material Girders ( #4622 )
2018-01-28 18:13:54 -08:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
96d3d361d0
Adds Boats, Ports /TG/ Buckling ( #4527 )
...
* Adds Boats, Ports /TG/ Buckling
* Travis Appeasement
* Changelog
2018-01-14 14:58:15 -06:00
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -08:00
807f1c7b4b
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
...
# Conflicts:
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
42a421e8e1
Adds Bonfires
2018-01-05 02:35:19 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
4d842c6590
Adds snowballs. ( #4414 )
2017-12-07 17:51:36 -06:00
7497aef295
work
2017-11-26 12:08:05 -05:00
0d9a175aac
Adds bracelets!
2017-11-17 18:27:35 +00:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
ef735ea89b
Merge pull request #4098 from Neerti/10/15/2017_surface_stuff
...
Touches Up the Surface Somewhat
2017-10-19 09:36:03 -05:00
95d93dae00
Touches Up the Surface Somewhat
...
Changes the rock texture to hopefully be a bit better. It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature. All trees now have health, and hitting it with things will reduce it. Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees. Hitting these with a sharp weapon converts them into two planks per log. Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites. Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
2017-10-18 12:04:39 -04:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
3c2831e5d9
Adds rings
2017-10-15 15:05:52 -05:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
a248a4a4a1
Ports Bay's railguns, and assorted gun sprites
2017-10-02 17:29:24 -05:00
a5acb5d1bb
Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics
...
Adds differing stack sprites
2017-09-29 16:07:04 -05:00
2f173dd16b
Adds differing stack sprites
...
Ports most of /tg/'s sprites for stacks displaying their contents. I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
2017-09-28 01:04:19 -04:00
3f882d6702
Adds riding crop
2017-09-27 23:27:17 -04:00
280f3010f8
Adds grave markers
2017-09-26 21:03:34 -05:00
40075a319a
Merge pull request #3806 from ghost/woodbuck
...
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
2755d3ddb1
HOTFIX
2017-09-21 20:26:48 -04:00
0c200a312b
Merge pull request #3828 from Belsima/xenospritz
...
Replaces xeno sprites with cooler and darker ones.
2017-09-19 20:56:53 -05:00
72300b669b
Fixes resin doors.
2017-09-17 18:27:52 -04:00
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
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Nadyr