08c5cdb736
should fix #5618 , trivial kitchen utensil bug
2014-07-18 06:58:47 -04:00
f7b516a5ab
Shit catches on fire now
...
Conflicts:
code/ZAS/Fire.dm
code/game/objects/items/weapons/storage/bible.dm
code/game/objects/items/weapons/storage/boxes.dm
code/modules/mob/living/living_defines.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photography.dm
code/setup.dm
2014-07-18 06:32:15 -04:00
34712ecc37
Fix for internal organ surgery
...
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
2014-07-16 20:17:50 +01:00
a07b7a5ce3
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
Conflicts:
code/defines/obj.dm
code/game/machinery/kitchen/smartfridge.dm
code/game/machinery/vending.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/games/cards.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living_defense.dm
2014-07-16 09:53:34 -04:00
dd6f54ed47
fun fact: This took 6 hours because bay uses different say().
...
fun fact: I'm never porting say-related stuff from bay.
Conflicts:
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/radio/headset.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
2014-07-16 09:27:12 -04:00
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
88098da3c7
Object verb removal crew
2014-07-15 08:47:43 -04:00
9b45dbabfb
Continued work in progress on a major revision of the NanoUI templating system.
...
Conflicts:
code/ATMOSPHERICS/components/omni_devices/filter.dm
code/ATMOSPHERICS/components/omni_devices/mixer.dm
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/game/machinery/kitchen/smartfridge.dm
code/modules/nano/nanoexternal.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/power/apc.dm
code/modules/power/smes.dm
code/modules/reagents/Chemistry-Machinery.dm
nano/css/shared.css
nano/js/nano_update.js
nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
c54b9e3626
Slime update
...
Conflicts:
baystation12.dme
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/say.dm
code/modules/mob/transform_procs.dm
code/modules/reagents/Chemistry-Recipes.dm
maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
8b6bd9dca5
usr -> user
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/game/objects/items/devices/PDA/PDA.dm
2014-07-13 15:25:11 -04:00
b6c6138c44
Gives the AI a hud
...
Conflicts:
code/_onclick/hud/_defines.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/screen_objects.dm
code/game/objects/items/devices/PDA/PDA.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/say.dm
code/modules/paperwork/photography.dm
2014-07-13 15:20:08 -04:00
955dfca291
removes sharpness from forks
...
too commonly available to enjoy the sharp bonus.
2014-07-13 08:59:41 -04:00
44e2f8acf2
Fixes human internal organs list
...
Conflicts:
code/modules/events/organ_failure.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
447b5e3faf
Fixes me being dumb with renaming variables
2014-07-13 08:34:38 -04:00
776369d9ee
Health Analyzer can read all types of beneficial medicine
...
Conflicts:
code/game/objects/items/devices/scanners.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:32:14 -04:00
87e7c32959
Fixes advanced trauma kits claiming to disinfect but not doing so
...
Conflicts:
code/game/objects/items/stacks/medical.dm
2014-07-13 08:18:16 -04:00
1e6963f1c8
Update PDA.dm
...
Patched the comment to match the actual, final behavior (Doh!)
2014-07-13 07:14:01 -04:00
6c7ab75146
Patched PDA scanner to be more useful
...
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
2014-07-13 07:13:45 -04:00
b9be3e6ed7
Stops buckled mobs from slipping (for now)
...
Conflicts:
code/game/turfs/simulated.dm
2014-07-13 06:48:17 -04:00
cf05d11854
Status displays now won't blank when undocking, too
2014-07-13 06:27:31 -04:00
7e64846a95
Improves suit cooler
...
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
2014-07-13 05:54:02 -04:00
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
a3e33913d4
Fix lamps/greenlamps. I should have done this ages ago.
2014-06-25 08:05:20 -04:00
71169c7903
Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand().
...
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
Conflicts:
code/modules/reagents/reagent_containers/food/snacks.dm
2014-06-24 12:02:29 -04:00
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
38559ab477
Makes forks usable.
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
icons/obj/kitchen.dmi
2014-06-22 10:58:50 -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
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
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
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
e138a3526f
Combat knife
...
Added combat knife
2014-06-22 04:23:18 +09:30
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
0320b1a32e
Fueltank explosions go to attack log
2014-06-20 16:26:27 -04:00
890d83a338
tweak flash invisibility removal length.
2014-06-20 14:35:52 -04:00
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
dedd110700
Send more stuff to attack log rather than admin log.
2014-06-20 13:42:42 -04:00
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
3fa03af4cb
Changes paint tile coloring to use color var, less icon procs.
2014-06-20 12:07:34 -04:00
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
3f6b32b15b
Fixes #5186
2014-06-20 08:05:09 -04:00
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
bc2fa7940a
Adds supply shuttle datum
2014-06-19 09:40:28 -04:00
5cd6acc420
Merge pull request #263 from Bone-White/master
...
Stasis Bag lock added
2014-06-18 22:43:13 -04:00
f4cf6b3a0d
Fix latex gloves box not having the right sprite
2014-06-18 22:15:34 -04:00
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
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
8057001497
Merge pull request #258 from Bone-White/master
...
Shock Glove fix, surgery table construction.
2014-06-17 22:45:32 -04:00
c353e263f4
Surgery table now constructed from plasteel x 5
2014-06-17 16:13:01 +01:00
1132879810
Fixed up the stupid handcuff shit that's been bugging me forever.
2014-06-17 10:26:04 -04:00
22fa2cd3c4
Merge pull request #256 from Bone-White/master
...
Space Law book link fix
2014-06-17 07:54:38 -04:00
Walter0o