Commit Graph

253 Commits

Author SHA1 Message Date
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
Cheridan 207f6a6048 Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
Fixes #11268, iconless wired glass tiles
2015-10-03 09:24:07 -05:00
Jordie c6627b3d70 Fixes iconless wired glass tiles 2015-10-02 21:28:19 +10:00
Razharas 7c757a735f Merge pull request #11968 from xxalpha/hot_or_not
Removed /proc/is_hot() && Removed /proc/is_sharp()
2015-09-25 04:02:52 +03:00
Razharas 3c4994749b Merge branch 'TacticalEspionageAction' of https://github.com/Incoming5643/-tg-station into Incoming5643-TacticalEspionageAction 2015-09-24 23:52:38 +03:00
xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha 3d15d791fb Merge branch 'edgy' into hot_or_not
Conflicts:
	code/__HELPERS/unsorted.dm
2015-09-24 03:12:08 +01:00
xxalpha deb60ae309 Replaced /proc/is_sharp() with /obj/item/proc/is_sharp(). 2015-09-24 03:08:28 +01:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
c0 8d54f835ae Materials - final solution 2015-09-22 00:18:37 +03:00
AnturK 8067597beb Display case chasssis 2015-09-17 17:53:26 +02:00
AnturK ac813a0ced Display cases 2015-09-17 17:53:24 +02:00
Cheridan 76d1e6add5 Merge pull request #11556 from bgobandit/hardmeatspike
MEAT SPIKE EXPANSION
2015-09-16 20:19:42 -05:00
Xhuis 1178fbe079 Major cult changes
The current code for runes is god-awful. Like, seriously terrible. This PR aims to fix that. Rather than having every rune effect defined in a single attack_hand proc, this PR will separate the runes into subtypes, which supports for more modular runes as well as cleans up the code.

It also separates invocation into a two different procs. The first of these will determine if the rune can be invoked; if that passes, the second will cause the rune's effects. There is also a third proc that will cause effects if the rune fails to invoke.

Research words have been removed, and all runes are now available from the start of the round. This is highly subject to change once some feedback is in from actual cult rounds.

Miscellaneous tweaks:

    Blood boil runes now explode when used
    Convert runes can now work solo, but take time
    Armor runes now only provide the basic armor set
    Tomes now do a static 15 burn damage and play a sound
    If the Escape objective is rolled, the amount of people that must escape will scale with the round population to a factor of 5 (i.e. 50 players = 10 cultists)
2015-09-16 10:04:49 +12:00
c0 75f2c92ebc Adds materials to ore 2015-09-13 23:37:13 +03:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Fox-McCloud ffa823e5b9 floor tile materials fixup 2015-09-12 16:11:48 -04:00
Incoming 3ef306fc4e Adds large cardboard boxes to the game, constructable from five sheets of cardboard.
Cardboard boxes are closets that:
*Can only carry a single person
*Are easy to destroy
*Are flammable
*Can't be welded shut

They can also can be used for more "tactical" purposes, at the same speed as walking.

Takes the opportunity to remove some object unfriendly coding.

If this is accepted they'll be a pull a little later to replace a few closets on the maps with boxes (or maybe code to have generic closets on the map to occasionally spawn as boxes instead).
2015-09-10 19:29:19 -04:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Fox-McCloud 0b8f2476b4 Fixes Gold Sheets Containing Plasma 2015-09-04 01:44:13 -04:00
bgobandit 94490f12d1 Adds some meat spike functionality. 2015-09-02 20:32:38 -04:00
xxalpha 70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
Cheridan 32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -05:00
Cheridan 7a469e240a Merge pull request #11437 from bgobandit/dronepax
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
Cheridan 87eae12f89 Merge pull request #11425 from bgobandit/golemsandglass
Golems no longer take damage from attacking with glass shards.
2015-08-29 11:17:34 -05:00
bgobandit 1e57cc6845 fixes ellipsis 2015-08-28 14:22:29 -04:00
bgobandit 607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
2015-08-28 02:54:43 -04:00
bgobandit 6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
bgobandit 326d849836 You can no longer use bruise packs, ointment or other medical stack items on drones. 2015-08-28 00:51:24 -04:00
c0 14bd455287 Button frame added to metal 2015-08-28 02:04:33 +03:00
c0 8474086bce Buttons and wall frames rework 2015-08-28 02:01:49 +03:00
bgobandit 1009c08ff4 Golems no longer take damage from attacking with glass shards. 2015-08-27 14:55:48 -04:00
Remie Richards 9622676d1e Merge pull request #11132 from Cheridan/too_much_fun
Astral Tiles 1.01 - Fun Removal
2015-08-12 06:20:54 +01:00
Cheridan 3a5cde5988 Merge pull request #10901 from CosmicScientist/mobcostumes
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
Cheridan 2df4cdb7cd Thank you Remie for catching this intentional error.
Removes amount = 30
2015-08-09 23:07:24 -05:00
Cheridan e6fe8baa24 Astral Tiles 1.01 - Fun Removal 2015-08-09 23:02:32 -05:00
Cheridan 63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
CosmicScientist 2844c80ed5 Fixing merge conflicts 2015-08-08 15:43:38 +01:00
Cheridan eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
MrPerson b0d511eff2 Automatic stack merging
When a stock moves onto the same tile as another stack, they merge together. Unless it was being thrown, in which case no, they don't merge. Unless the stack was the original target to begin with, then yes, they do merge.

Just a convenience feature. The one downside is that crowbarring up a floor tile won't merge with other tiles on the floor, but if someone makes that event call Move() like it's supposed to, it should work fine. That would just be out of scope for this PR.
2015-08-01 10:34:50 -07:00
CosmicScientist 2d2e1acf6a Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder 2015-07-28 20:19:26 +01:00
Jordie 9b0b4e1aa4 Merge pull request #10710 from xxalpha/cablecoilbackpack
Fixed storage not updating when joining cable coils.
2015-07-25 19:12:26 +10:00
xxalpha 8e00cdfe9a Fixed storage not updating when joining cable coils.
Fixed stack objects not updating storage when deleted.

Added handle_atom_del proc to be called on destroy.

Label comment for handle_atom_del()
2015-07-22 17:58:05 +01:00
phil235 452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Xhuis f40b4381d4 Separates construction into the door and a frame 2015-07-11 11:25:14 -04:00
Jordie 1714a8ee10 Merge pull request #10447 from xxalpha/plasmafix
Fixed plasma not stacking.
2015-07-09 20:45:21 +10:00
xxalpha e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00