Commit Graph

168 Commits

Author SHA1 Message Date
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
Anewbe 3c2831e5d9 Adds rings 2017-10-15 15:05:52 -05:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe a248a4a4a1 Ports Bay's railguns, and assorted gun sprites 2017-10-02 17:29:24 -05:00
Anewbe a5acb5d1bb Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics
Adds differing stack sprites
2017-09-29 16:07:04 -05:00
Neerti 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
killer653 3f882d6702 Adds riding crop 2017-09-27 23:27:17 -04:00
Anewbe 280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe 40075a319a Merge pull request #3806 from ghost/woodbuck
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe 0c200a312b Merge pull request #3828 from Belsima/xenospritz
Replaces xeno sprites with cooler and darker ones.
2017-09-19 20:56:53 -05:00
Belsima 72300b669b Fixes resin doors. 2017-09-17 18:27:52 -04: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
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima eb341aaa65 Adds wooden buckets, craftable with botany. 2017-09-09 17:16:34 -04:00
Anewbe 9ce3c85127 Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Brings back the aliens (With hitches).
2017-09-04 18:32:25 -04:00
Mechoid 5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07: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
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
silveryferret 3d3ff303c7 Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium 2017-07-19 23:14:15 -04:00
silveryferret 7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Arokha Sieyes 80670b420c Merge current master in 2017-04-25 20:14:38 -04:00
Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe 9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
Leshana 706ca5d0eb Ports new floor decals, floor types, and floor sprites from Eris 2017-04-18 23:20:17 -04:00
Leshana a6ae62b13b Ported Eris's "railings"
* Railings are an ON_BORDER object that looks like a railing; you can throw and reach across it, but it stops you from falling into holes or whatever.
* Mobs can climb over them (or throw other mobs over them!)
* They are construtable/deconstructable.
* Smoothly auto-joining sprites to look like a railing.
* Changes from Eris:  Converted << to to_chat(),  Desnowflaked some code, Fixed being able to climb over when windows are in the way.
2017-04-18 23:19:26 -04:00
Leshana 5dac8b91b6 Merge branch 'master' of ../Polaris into polaris-sync 2017-04-18 19:35:59 -04:00
Neerti 6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Cerebulon 843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
Leshana 7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Neerti 5b4ab95bd5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor 2017-04-14 03:54:23 -04:00
Anewbe 6a99123f51 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-10 11:26:09 -05:00
Leshana 6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04: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
Arokha Sieyes 1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
Schnayy 971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Leshana f93141d7d3 Merge remote-tracking branch 'polaris/master'
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	vorestation.dme
2017-03-22 20:08:29 -04:00
Anewbe 38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Neerti b571ed9c66 Continues work on the surface map 2017-03-21 16:11:13 -04:00
Neerti 88d62cffdb work 2017-03-14 08:04:29 -04:00
Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme
2017-03-06 20:58:38 -05:00
Neerti 411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Arokha Sieyes 387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Neerti 836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Dhaeleena 3cdf56f4c3 Flesh Turfs 2017-01-24 23:48:50 -03:00
MagmaRam 190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
Yoshax 102c0c2277 Makes clipboards producible out of wood 2016-11-12 01:26:20 +00:00
Neerti 828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Hubblenaut 044a677ab0 Construction Tweaks and Fixes (#2253)
* Fixes reinforced Walls construction

when having one sheet left in the stack

* Amends Windoors

 - Assemblies are now made with two sheets of either normal or reinforced
   glass sheets, for normal and secure windoors respecting.
 - Assemblies can now be named with a pen, just like airlocks.
 - Windoor assemblies now get placed like windows, and windows take
   windoor assemblies into account when placed.
 - Decapitalises windoor assembly names.
 - Shattering windoors will make them drop exactly what they were made of
   now.
 - Prying emagged windoors will no longer make them shatter on top of
   returning to an assembly.
 - Cleans up a lot of code and gets its own update_icon() proc.

* Amends airlocks

 - Fixes airlocks occasionally not updating their icon correctly.
 - Fixes airlocks causing sparks on spawn as if they were damaged.
 - Fixes airlock not being anchored after being turned into an assembly.
 - Decapitalises airlock names.

* Windows that get unanchored by force will now correctly have the rotate verb.

* Adds changelog entry
2016-08-02 18:39:22 +01:00