Commit Graph

3389 Commits

Author SHA1 Message Date
Zuhayr
727d7400ee Shuffling around table and crate knock/climb procs.
Conflicts:
	code/game/objects/structures.dm
2014-06-24 06:59:42 -04:00
Zuhayr
a06621b7af Makes table/crate falling a bit more dangerous. 2014-06-24 06:56:07 -04:00
Zuhayr
7ad261bd2f Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened.
Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-06-24 06:52:13 -04:00
Mloc-Argent
69d9d9fc49 atmos: make fires more destructive
Fires can now burn through walls, windows, and (with a high enough
 temperature) rwalls.
New proc: adjacent_fire_act().  Called on turfs that a fire isn't able
 to spread to. (walls, floor surrounded by windows, etc.)

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/structures/window.dm
2014-06-24 06:48:08 -04:00
mwerezak
55532e51a0 Supply controller now holds a ref to it's shuttle
Instead of having to look it up every time.

Conflicts:
	code/game/supplyshuttle.dm
2014-06-23 10:33:05 -04:00
ZomgPonies
de5faa1a6a Legless people can drag themselves onto chairs,bed,wheelchairs now. 2014-06-22 15:07:03 -04:00
Zuhayr
38559ab477 Makes forks usable.
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
2014-06-22 10:58:50 -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
mwerezak
c67bd0a8e8 Less terrible sprite for suit cooling device
Also adds a few of them to EVA storage.

Conflicts:
	icons/obj/device.dmi
	maps/tgstation2.dmm
2014-06-22 01:46:45 -04:00
mwerezak
1625d82487 IPCs actually take heat damage from temperature now
Also fixes the healthanalyzer still not scanning IPCs properly (scanning
them when it shouldn't)

Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/robot/component.dm
2014-06-21 17:31:59 -04:00
mwerezak
c11e6ae106 Adds suit cooling device
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/clothing/spacesuits/ninja.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/life.dm
2014-06-21 17:23:30 -04:00
Necaladun
e138a3526f Combat knife
Added combat knife
2014-06-22 04:23:18 +09:30
Chinsky
3ae1d2011f Fixes #5311 2014-06-21 12:57:03 -04:00
mwerezak
6e256506e3 Body temperature fixes and updates
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.

IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.

As well, having an infection will increase your body temperature, and
body scanners now detect infections.

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
2014-06-21 12:20:22 -04:00
ZomgPonies
62d7ab65b2 Explosions go to attack logs. 2014-06-21 07:27:31 -04:00
ZomgPonies
0320b1a32e Fueltank explosions go to attack log 2014-06-20 16:26:27 -04:00
d3athrow
890d83a338 tweak flash invisibility removal length. 2014-06-20 14:35:52 -04:00
d3athrow
9e0e080376 Genetics tweaks and changelog.
Stealth is overtime instead of instantaneous
Cryokinesis is less OP, deals less damage to unclothed targets and respects hardsuits and internals.
Leap is nerfed, cooldown doubled as well as not being able to leap while restrained.

T-ray scanners and flashes will reveal 'invisible' mobs for a short period of time. this is a work in progress and possibly buggy!

Conflicts:
	html/changelog.html
2014-06-20 14:34:38 -04:00
ZomgPonies
dedd110700 Send more stuff to attack log rather than admin log. 2014-06-20 13:42:42 -04:00
Chinsky
fc76ac01e0 Nextgen lighting #2: Lights
Can paint light tubes and bulbs with paint and stick in sockets to get colored lights.
2014-06-20 12:07:46 -04:00
Chinsky
3fa03af4cb Changes paint tile coloring to use color var, less icon procs. 2014-06-20 12:07:34 -04:00
Cael Aislinn
c23cb7afef rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_defines.dm
2014-06-20 08:47:51 -04:00
Cael Aislinn
5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
mwerezak
3f6b32b15b Fixes #5186 2014-06-20 08:05:09 -04:00
mwerezak
723979115c Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00
mwerezak
bc2fa7940a Adds supply shuttle datum 2014-06-19 09:40:28 -04:00
ZomgPonies
5cd6acc420 Merge pull request #263 from Bone-White/master
Stasis Bag lock added
2014-06-18 22:43:13 -04:00
Boop
f4cf6b3a0d Fix latex gloves box not having the right sprite 2014-06-18 22:15:34 -04:00
Bone White
38655f81da Stasis Bag lock added
Can be locked/unlocked by medical access.  Unlocked by default when
closed.
2014-06-18 16:20:31 +01:00
Jarcolr
2ae3dd0746 Adds paths for therapy dolls
http://puu.sh/9xlQu/53016923a6.dmi for the dolls that are already in the
code but unused.

Conflicts:
	code/game/objects/items/toys.dm
2014-06-18 00:08:33 -04:00
ZomgPonies
8057001497 Merge pull request #258 from Bone-White/master
Shock Glove fix, surgery table construction.
2014-06-17 22:45:32 -04:00
Bone White
c353e263f4 Surgery table now constructed from plasteel x 5 2014-06-17 16:13:01 +01:00
ZomgPonies
1132879810 Fixed up the stupid handcuff shit that's been bugging me forever. 2014-06-17 10:26:04 -04:00
ZomgPonies
22fa2cd3c4 Merge pull request #256 from Bone-White/master
Space Law book link fix
2014-06-17 07:54:38 -04:00
mwerezak
6ada0cf263 Adds sharp and edge flags to appropriate items
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.

Conflicts:
	code/modules/research/xenoarchaeology/finds/finds_misc.dm
2014-06-17 07:08:25 -04:00
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
ZomgPonies
bd346bca9a Bleh 2014-06-17 04:04:57 -04:00
ZomgPonies
c0f997a022 Fix science shuttle and white windows galore. 2014-06-17 03:44:15 -04:00
ZomgPonies
88920b7235 Runtime fix / removing extra testing messages 2014-06-17 00:16:59 -04:00
ZomgPonies
f84214533a Removing even more unneeded test messages 2014-06-17 00:06:53 -04:00
ZomgPonies
2263375b10 Revert "Optimize the fuck out of using checks in machines."
This reverts commit 5649e2c34d.

Conflicts:
	code/game/objects/objs.dm
2014-06-16 22:03:34 -04:00
ZomgPonies
128e1ba386 Revert "Fix safe...?"
This reverts commit 0762e137ab.
2014-06-16 22:03:03 -04:00
Bone White
619cf8899d Space Law book link fix
Fixed the link in the Space Law book to correctly link to the printable
version of the space law page on the wiki.  Note that it uses Space_law
and not Space_Law on the wiki, as the font is smaller, but there are
some formatting errors on that page.  I can't edit the wiki page
directly to fix this because it's protected, but I wanted to keep the
smaller font to make it easier to read in game.
2014-06-16 14:04:17 +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
ZomgPonies
692e7ef435 Fixing biting your own hand off 2014-06-14 23:18:12 -04:00
Loganbacca
083cd19c6a New vehicle framework
- Implements a new vehicle framework
- Adds cargo trains

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-06-14 22:14:53 -04:00
Zuhayr
f219643f96 Fixes #5195 2014-06-14 22:02:35 -04:00