Commit Graph

151 Commits

Author SHA1 Message Date
KorPhaeron
ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
c0
8dfef3b793 fix 2016-03-12 15:07:33 +03:00
c0
9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0
f3ecb132ba Adds Alien Alloys 2016-03-12 15:06:03 +03:00
AnturK
56d2a34201 Splits beds and chairs
Adds deconstruct structure helper
Moves chair sprites from objects.dmi to chairs.dmi
Fixes check shields passing proper flags on unarmed attacks
Makes stools and chairs able to be picked up
2016-02-18 17:55:38 +01:00
Firecage
c4c37d6553 Makes the gibber give skins when gibbing humans. Also adds craftable human suits from human skin. 2016-02-11 09:59:23 +02:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Bjorn Neergaard
dbc64b7d28 tgui fire alarms 2016-01-25 12:02:59 -06:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
bawhoppen
745134e8e8 nerfs cost 2015-12-23 11:19:15 -06:00
Lularian
fed268e5e5 wooden buckler 2015-12-23 00:36:34 -06:00
oranges
134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
MMMiracles
392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
MMMiracles
6ac96194ba snow stuff. 2015-12-04 18:52:17 -05:00
MMMiracles
de4c8b8674 snow walls+material 2015-12-04 15:07:05 -05:00
kingofkosmos
156d9b558c Crossing a glass shard in space without shoes won't hurt and stun the user anymore. 2015-11-15 17:19:07 +02:00
Tkdrg
e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
KorPhaeron
f58dcd9e5d 3 types 2015-11-01 09:08:15 -06:00
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
Remie Richards
97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01: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
Remie Richards
131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards
58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01: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
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
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
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
Cheridan
32d74ad19c Merge pull request #11433 from Core0verload/framed
Buttons and wall frames rework
2015-08-30 13:43:19 -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
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
CosmicScientist
2844c80ed5 Fixing merge conflicts 2015-08-08 15:43:38 +01: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
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