Commit Graph

95 Commits

Author SHA1 Message Date
ZomgPonies 207959cc7d crash fix 2014-02-28 21:31:59 -05:00
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Jesus Hussein Chris 95f7280781 Generic attack sounds for all melee weapons
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
Pete Goodfellow 331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
2014-01-19 21:25:47 -05:00
Nanai 69e713c04a Surgery Update
Proper repair surgery for internal organs- Scalpel replaced by membranes from advanced kits, robotic hearts have a separate surgery.

Conflicts:
	code/modules/surgery/ribcage.dm
2014-01-04 15:44:23 -05:00
ZomgPonies dcaeea24bf Adding large cardboard boxes 2013-12-25 07:06:13 -05:00
ZomgPonies 85e75ca052 Walking on glass shard fix 2013-12-14 20:02:32 -05:00
alex-gh 270d5c24a7 Placing tiles on a space turfs no longer results in unsimulated platings 2013-12-11 00:40:10 +01:00
ZomgPonies abcfa2fce0 Crate fixes 2013-11-30 07:58:18 -05:00
ZomgPonies 6467bbbb39 Added growing and rolling your own weed, tobacco, tea, coffee 2013-11-27 16:51:04 -05:00
ZomgPonies 887e172a26 More asteroid unsim fixes 2013-11-23 06:55:46 -05:00
alex-gh 2c2dfdc820 Allow for creation of stacks with amount = 0 2013-11-13 18:33:57 +01:00
ZomgPonies 05955bb230 Added plasma windows 2013-11-02 04:03:07 -04:00
ZomgPonies 2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies 53e005d2a1 Glass HasEntered runtime fix 2013-10-05 07:19:26 -04:00
ZomgPonies 78f14f11cc New vending machine, enabling Ian clothes, bug fixes, map update 2013-09-28 01:38:18 -04:00
ZomgPonies 9bde25863f Revert "Had to disable bees TEMPORARILY because string limit"
This reverts commit 89780436fa.
2013-09-15 23:27:55 -04:00
ZomgPonies 89780436fa Had to disable bees TEMPORARILY because string limit 2013-09-15 21:20:21 -04:00
ZomgPonies c284cef185 makes bananades buildable 2013-09-14 13:36:55 -04:00
ZomgPonies e38d18b7f9 HONKputer sprites and files 2013-09-11 21:02:42 -04:00
ZomgPonies 7213a6d26a Shouldn't have put that in the dme 2013-09-11 19:18:34 -04:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Erthilo 3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
comma 8735254b87 Moved code from parent class with checks to subclasses.
Lots of copypaste code, but better that bloating that one main function even more IMHO.
As for bloat reason - readded advanced medithingies. Work same as lesser ones, but heal some damage directly instead, and have different messages/
2013-08-01 05:53:48 +04:00
Mloc-Argent 8575b7a286 And once again, did that the wrong way around. Whoops.
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-20 18:41:50 +01:00
Mloc-Argent adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-20 18:38:00 +01:00
LordBraindead 5d63943d07 Update mineral.dm
removed sheettpye = "plastic" again because it snuck back in after being removed already
2013-07-14 21:50:48 +02:00
LordBraindead 08d2e22220 fire update
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
Zuhayr 1d28bb7cb3 Message tweaks. 2013-06-28 15:55:41 -07:00
Zuhayr 58bf2d218c Bandages and ointment cannot be used through space suits. 2013-06-27 18:02:10 -07:00
SkyMarshal aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Segrain f97f3596a6 Punctuation fix. 2013-06-24 12:03:47 +03:00
Segrain 0d6e49742a Typo fix. 2013-06-24 06:06:00 +03:00
Segrain 65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Segrain 7fec5309f7 Airlock construction update. 2013-06-23 20:42:58 +03:00
Segrain 1f7d39d99f Stacks update. 2013-06-23 20:31:55 +03:00
Chinsky bdb16b1f99 Renamed bruise pack back to gauze.
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
jediluke69 e256f2d095 should nerf nanopaste 2013-04-24 19:42:19 -04:00
NerdyBoy1104 390029007d Added Rice and Plastellium plants. Rice stalks are grinded into rice that you can make boiled rice, rice pudding and Sake from. Plastellium is refined into plastic by grinding it into plasticide. 20 plasticide + 10 poly acid makes 10 sheets of platic which can be used to make crates, forks, spoons, knives, ashtrays or plastic bags from. 2013-04-23 22:52:08 +01:00
Spamcat 5e2c921933 Fixed nanopaste messages.
(and some my shitcode)
2013-03-18 18:01:51 +04:00
Christian Bielert 14a96f77ab Merge pull request #2539 from comma/organ
Organ code restructuring
2013-03-16 07:10:40 -07:00
Chinsky a2e2c373ef Added new item - nanopaste.
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
2013-03-13 05:57:53 +04:00
Cael_Aislinn f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:01:33 +10:00
Cael_Aislinn 86a58380b3 added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-09 23:39:24 +10:00
Cael_Aislinn 46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:40:46 +10:00
Cael_Aislinn 9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:27:44 +10:00
Cael_Aislinn 8ee5672159 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-22 23:56:38 +10:00
Cael_Aislinn 66b04ccf1d made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 20:00:05 +10:00
Chinsky 6015df7178 Tweaks to side effects.
Removed itch one. Caused lots of whining, since it's quite counterintuitive to take drugs to treat itch instead of scratching it or removing bandage.
Made side effects contracting probability-based, probability higher the stronger chemical is.
2013-02-20 20:00:01 +04:00