Commit Graph

91 Commits

Author SHA1 Message Date
Tigercat2000
e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
SirBloodBuske
b63d1d0163 Adding Intercom to recipes 2015-05-02 15:12:42 -07:00
Tigercat2000
dfc74ebde6 Modify fire_act to temperature_expose where needed
This commit changes a bunch of objects fire_act's to temperature_expose,
to allow for superhot gas to act like an actual hotspot. This behaviour is
consistant with -tg-.
2015-04-29 16:56:12 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Tigercat2000
f76284b7af Add afterbuckle proc to beds, refactor comfychairs
This commit ports Baystation12/Baystation12#8527, as well as their
afterbuckle system. After a mob is buckled/unbuckled, afterbuckle will be
called on the object, which does nothing by default.

Comfy Chairs have been refactored to use a grayscale sprite, and also to
use overlays for the arms. This means that new colors are just a RGB
definition.
2015-04-25 09:36:06 -07:00
ComicIronic
44aa2ba225 Code rework of placing things on walls.
Stuff goes under types.
Types have procs.
Never have 500 lines of repeated code again.

I came very close to crying while editing this. You should appreciate
that.

----

This commit entirely reworks how placing things on walls work- Posters
have intentionally been left alone to reduce the amount of lines
changed. With this commit, wall-mounted objects are no longer snowflaked
into the wall file.
2015-04-19 14:29:42 -07:00
Tigercat2000
acc3755a98 Adds glass tables, glass table frames
This commit adds glass tables (credit to WalterJe of -tg-'s fourms for
the sprites) to the game. These can be constructed with two metal
sheets, and two glass sheets. Flipping the table causes it to shatter
and deconstruct itself. You can deconstruct the table at any stage
with a wrench.
2015-04-13 06:29:05 -07:00
FalseIncarnate
ae13c938c5 Kitchen Overhaul
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.

Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard

Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds

Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.

Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.

This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04:00
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
Fox-McCloud
a7f631f364 Health and Stack Fixes 2015-03-01 01:07:14 -05:00
Markolie
004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
2015-02-22 22:15:45 +01:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Fox-McCloud
bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05:00
Markolie
efb45ea228 Table crafting refactor 2015-02-22 01:50:57 +01:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
266b4cb113 R&D UI rework 2014-12-22 17:38:22 +01:00
GinjaNinja32
0427641d89 Moved all shard code to one file. Fixed #5992
Conflicts:
	code/defines/obj/weapon.dm
	code/game/objects/items/stacks/sheets/glass.dm
2014-08-16 21:43:38 -04:00
Artorp
d0447f061a Fixes states of onedirectional windows
Will only change the reinforced plasma window. You don't have to pry
them out of a frame before anchoring them anymore.
2014-08-11 01:51:10 +02:00
Artorp
048f5235c9 Plasma construction and full window fixes
- Fixed plasma window construction

- Fixed full windows from stopping players and gasses from moving above
them even with density set to 1
2014-08-11 01:06:27 +02:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
mwerezak
b64441cb26 Fixes FEA temperature_expose() being used...
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
2014-06-22 02:03:42 -04:00
Bone White
c353e263f4 Surgery table now constructed from plasteel x 5 2014-06-17 16:13:01 +01:00
Zuhayr
a80c317cbe More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/supplyshuttle.dm
2014-06-15 07:58:00 -04:00
ZomgPonies
2097bed55d 3rd mining overhaul commit, fun KEPT. 2014-06-15 07:52:52 -04:00
ZomgPonies
d31a39256e 2nd mining overhaul commit. Fun KEPT. 2014-06-15 07:45:27 -04:00
Zuhayr
ef59deb928 First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
Zuhayr
1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
2014-05-12 02:59:53 -04:00
Zuhayr
d606d774d8 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/examine.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/recycling/disposal.dm
	icons/mob/robots.dmi
	icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
ESwordTheCat
3c3e4c7dc8 Heh forgot these. 2014-05-03 22:54:24 -04:00
ESwordTheCat
532298c725 Tweak object pool system.
Conflicts:
	code/game/objects/structures/grille.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/special.dm
2014-05-03 22:54:09 -04:00
Zuhayr
7fe9b670f3 Fix for previous commit.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
2014-05-03 17:35:55 -04:00
Zuhayr
9ec5a18e0b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
2014-05-03 17:34:43 -04:00
ESwordTheCat
dde219a581 Object pooling immature implementation.
Conflicts:
	code/__HELPERS/experimental.dm
2014-04-19 19:42:04 -04:00
Rob Nelson
9227481a8a Standardize windows.
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
VelardAmakar
dc6f794368 Adds the ability to construct, destroy, and take apart bookcases.
Bookcases can be built using 5 wood planks.
Bookcases can be destroyed using weapons(50HP).
Bookcases can be taken apart using a wrench.
2014-04-19 19:13:33 -04: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
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
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
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
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