266b4cb113
R&D UI rework
2014-12-22 17:38:22 +01:00
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
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
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
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
b33df4745c
Removed deprecated power generation stuff (AM, RUST) to free up more procs
2014-07-25 11:33:37 -04:00
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
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
c353e263f4
Surgery table now constructed from plasteel x 5
2014-06-17 16:13:01 +01:00
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
2097bed55d
3rd mining overhaul commit, fun KEPT.
2014-06-15 07:52:52 -04:00
d31a39256e
2nd mining overhaul commit. Fun KEPT.
2014-06-15 07:45:27 -04:00
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
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
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
3c3e4c7dc8
Heh forgot these.
2014-05-03 22:54:24 -04:00
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
7fe9b670f3
Fix for previous commit.
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
2014-05-03 17:35:55 -04:00
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
dde219a581
Object pooling immature implementation.
...
Conflicts:
code/__HELPERS/experimental.dm
2014-04-19 19:42:04 -04:00
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
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
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
cb5367ed96
Switching cable coils to stacks
2014-01-21 21:23:26 -05:00
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
dcaeea24bf
Adding large cardboard boxes
2013-12-25 07:06:13 -05:00
85e75ca052
Walking on glass shard fix
2013-12-14 20:02:32 -05:00
abcfa2fce0
Crate fixes
2013-11-30 07:58:18 -05:00
6467bbbb39
Added growing and rolling your own weed, tobacco, tea, coffee
2013-11-27 16:51:04 -05:00
05955bb230
Added plasma windows
2013-11-02 04:03:07 -04:00
2c0614d3af
Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter()
2013-10-28 06:45:15 -04:00
53e005d2a1
Glass HasEntered runtime fix
2013-10-05 07:19:26 -04:00
9bde25863f
Revert "Had to disable bees TEMPORARILY because string limit"
...
This reverts commit 89780436fa
2013-09-15 23:27:55 -04:00
89780436fa
Had to disable bees TEMPORARILY because string limit
2013-09-15 21:20:21 -04:00
c284cef185
makes bananades buildable
2013-09-14 13:36:55 -04:00
e38d18b7f9
HONKputer sprites and files
2013-09-11 21:02:42 -04:00
7213a6d26a
Shouldn't have put that in the dme
2013-09-11 19:18:34 -04:00
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
3557e12943
Suits with shoes protect against glass shards.
2013-08-28 12:49:23 +01:00
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
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
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
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
aa85e757d4
Added a better framework for multi-tile doors, pulling works strangely though.
2013-06-24 17:21:55 -07:00
0d6e49742a
Typo fix.
2013-06-24 06:06:00 +03:00
65731b232b
Quickfix and changelog.
2013-06-23 20:52:19 +03:00
7fec5309f7
Airlock construction update.
2013-06-23 20:42:58 +03:00
1f7d39d99f
Stacks update.
2013-06-23 20:31:55 +03:00
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
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
Markolie