Commit Graph

122 Commits

Author SHA1 Message Date
mwerezak
0ceb0e291d Fixes #10314
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
2015-08-02 00:01:10 -04:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
Zuhayr
4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr
f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30
Zuhayr
a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
GinjaNinja32
354859b889 Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks 2015-05-15 04:47:18 +01:00
GinjaNinja32
5f65565f45 Bugfixes, removing the remnants of table_parts, changelog. 2015-05-13 20:40:00 +01:00
GinjaNinja32
4b87799072 New tables, code section. Changelog entry soon. 2015-05-13 19:08:39 +01:00
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Zuhayr
79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
f3be9b41f0 Ports /vg/'s Nas-Sie remake.
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
PsiOmega
1ba8dcbca9 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/vending.dm
2015-04-10 15:25:34 +02:00
Kelenius
20d62c87ff Borg module fixes
Fixes #8775
Fixes #8797
2015-04-10 09:50:47 +03:00
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
GinjaNinja32
458970a617 Merge remote-tracking branch 'upstream/dev' into reagent_dispenser 2015-03-16 21:21:56 +00:00
mwerezak
9aed472531 Minor storage cleanup
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
2015-03-05 11:08:22 -05:00
GinjaNinja32
c3388020ff Reagent dispenser rework 2015-03-02 02:25:32 +00:00
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths
Adds robot synths
2015-02-21 11:43:39 +03:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
mwerezak
57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Chinsky
1c3b1087dd Merge pull request #7582 from Zuhayr/richard
Do you like hurting other people?
2015-02-03 18:10:34 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
5e7133dd08 Converted baseball bats to twohanded weapons. 2015-01-20 19:14:38 +10:30
Zuhayr
a76af3c7c5 Fixes #7572 2014-12-30 16:33:34 +10:30
Zuhayr
a7f47e32d7 Merge pull request #7534 from mwerezak/doors
Doors and stacks
2014-12-28 13:14:23 +10:30
mwerezak
64e26b2dbd Fixes robot stacks transferability
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
2014-12-25 15:06:31 -05:00
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Amunak
4882074739 Code formatting, EOL at EOF fixes, refactoring 2014-12-18 03:11:49 +01:00
PsiOmega
8f342ada74 Constructable blood packs.
Can now make your own blood packs from plastic.
2014-12-01 08:40:58 +01:00
Zuhayr
cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
mwerezak
af8da7de03 Adjusts glass sheet construction menu input 2014-11-16 22:30:07 -05:00
Zuhayr
4090f04839 Readded monkey dexterity checks in each attack_hand as appropriate. 2014-11-13 17:46:37 +10:30
mwerezak
ab2b4608e0 Fixes #6702 and cleanup
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
2014-11-12 20:09:04 -05:00
PsiOmega
f8ead9139a (De)constructable emergency shutters.
Can now construct emergency shutter assemblies from metal sheets, same as door assemblies.
Requires air alarm circuits to complete, rather than airlock circuits.
2014-10-31 13:35:48 +01:00
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-05 19:24:30 +01:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Whitellama
aa0ab32a9c Egg boxes and donut boxes can be constructed from cardboard 2014-08-28 18:27:51 -07:00