Commit Graph

19974 Commits

Author SHA1 Message Date
Chinsky
284d1cc1f5 Merge pull request #9360 from Kelenius/ofChemAndCarbon
Carbon now clears ingested chemicals
2015-05-20 01:45:13 +03:00
HarpyEagle
10067349b2 Cleans up debug prints 2015-05-19 17:47:51 -04:00
Neerti
6c16923d11 Fixes issue with removing dead plants from hydro treys as a borg. 2015-05-19 15:28:38 -04:00
PsiOmega
b08302f7b1 Pulse measuring tweaks.
Now both the pulse checker and target must remain still for the duration of the check.
Previously it may have been possible for dead humans to check the pulse of self and others.
2015-05-19 21:15:59 +02:00
Kelenius
35a6ba6b87 Axes prototyping. o7 2015-05-19 21:12:17 +03:00
Atlantis
61c0eaa4a3 isrobot() fix 2015-05-19 17:44:51 +02:00
Atlantis
4149fead4e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanocrusade-two 2015-05-19 17:39:43 +02:00
Atlantis
3008087a95 Suggestions + Changelog
- Implements PsiOmegaDelta's suggestions
- Adds changelog
2015-05-19 17:39:25 +02:00
Atlantis
f0cd799021 Changelog + fluff fix
- Finally adds changelog entry
- System override message modified according to github discussion.
2015-05-19 17:28:21 +02:00
Chinsky
8871696c52 Merge pull request #9353 from Ccomp5950/goat_simulator3000
Goat Buffs.
2015-05-19 17:56:55 +03:00
Techhead0
aa22f7307a Replaces gaseous reagents with organic chemistry ones.
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
2015-05-19 09:32:24 -04:00
Kelenius
fd450561c2 Carbon now clears ingested chemicals
Also fixes a bug that made ethy-thing not work.
2015-05-19 15:41:14 +03:00
Zuhayr
06c04edb5e Merge pull request #9337 from comma/ghettoMD
Ghetto MDing
2015-05-19 20:38:50 +09:30
Chinsky
05975d78b1 Adds a portable organs/lunch freezer 2015-05-19 09:33:26 +03:00
Chinsky
8e46bef3d5 Merge pull request #9351 from PsiOmegaDelta/LateJoinAI
Fixes #9244.
2015-05-19 08:42:46 +03:00
Chinsky
df917e1538 Changes from PR feedback. Moar feedback for inspecting mob. 2015-05-19 07:16:17 +03:00
mwerezak
953e8be44e Fire tweak 2015-05-19 00:09:37 -04:00
Chinsky
77519d160f Generalized head reattachment to work with all limbs.
Now you can attach your useless chunks of meat back!
Needs second step to make meat limb usable, use hemostat/cable/mousetrap.

Changes how organs 'die'. Instead of damage they now acquire germs, 2-6 points per tick, twice faster after hitting acute infection stage. Once they reach necrosis stage, they die. All in all it takes ~7 minutes for organ to go bad without a freezer.
As a bonus, you can now attach robogroins and roboheads (no brain included)
Fixes stumps being un-cuttable, which prevented all kinds of fun stuff with replacements.
Removed ORGAN_DESTROYED check from processing, take_damage should be taking care of that now.
2015-05-19 07:09:00 +03:00
mwerezak
e23f5e7e06 Fixes hardsuit shocking 2015-05-18 20:09:31 -04:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Chinsky
8e5f5ef8e0 Merge pull request #9165 from Yoshax/trapping
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
Atlantis
4cd2417eb8 Implements suggestions from github
- qdel() instead of del()
- z in config.station_levels insted of z == 1
- Typo fix
- Playercount is now 2 instead of 1 which was debug setting
- AI is now properly deleted when struck by very strong explosion (heavy impact).
- Hardware now properly uses install(). Hardware list is generated from existing datums using typesof()
2015-05-18 22:05:18 +02:00
PsiOmegaDelta
ce8188c1a2 Merge pull request #9350 from Hubblenaut/lockers
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
PsiOmega
c26b4e79b9 Fixes #9244.
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +02:00
Hubblenaut
ac1f3c3530 Fixes overbloated closets 2015-05-18 18:34:25 +02:00
PsiOmega
e2e0ffc6e5 Compilation fixes. 2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
PsiOmegaDelta
a7d72940cf Merge pull request #9348 from Baystation12/master
Dev-freeze
2015-05-18 17:48:36 +02:00
Chinsky
33e8791fe9 Merge pull request #9264 from Hubblenaut/airlocks
Fixes airlock wires
2015-05-18 18:21:05 +03:00
Chinsky
6169c49832 Merge pull request #9143 from Loganbacca/qol_mule
[QOL] MULE destination selection
2015-05-18 18:20:17 +03:00
Chinsky
6a14d39209 Merge pull request #9345 from Zuhayr/master
Set vine mouse opacity to 2.
2015-05-18 18:19:45 +03:00
Hubblenaut
86426d0424 Fixes airlock wires and adds backup power light 2015-05-18 16:55:12 +02:00
Zuhayr
f72203c611 Set vine mouse opacity to 2. 2015-05-18 22:07:00 +09:30
Daranz
e13bc6ab54 Add access_medical_equip to get_all_accesses() 2015-05-18 08:33:51 -04:00
Kelenius
cd9aa7c9af Fixes mankini typo 2015-05-18 12:34:03 +03:00
Chinsky
a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart
Gamestart cleanup.
2015-05-18 12:00:49 +03:00
ccomp5950
53e52a6f92 Goat Buffs.
Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
2015-05-18 04:35:19 -04:00
PsiOmegaDelta
2ff11b4390 Merge pull request #9340 from GinjaNinja32/table_reinf_icon
New reinforced table overlays that better match the old sprites.
2015-05-18 08:24:36 +02:00
GinjaNinja32
cda71446eb Fixes #9341 2015-05-18 07:10:37 +01:00
Chinsky
814d38ce66 Adds more info to self-examine 2015-05-18 08:25:34 +03:00
Chinsky
c62958fc89 Fixes #9336 2015-05-18 07:58:41 +03:00
Chinsky
ef0f21bd1a Ghetto MD part 2
Examining people with grab-exmaine move now can tell you if they have toxins in blood, or are short of breath.
Stethoscopes now actually give real info about severe oxyloss/internal organs damage.
2015-05-18 07:45:29 +03:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Chinsky
26e5630e23 Ghetto diagnostics!
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
Chinsky
f016d51f38 Fixes cavity surgery using old organ names 2015-05-18 06:15:09 +03:00
Chinsky
57a7c307b9 Fixes dislocation not being set properly on an actual targeted limb.
Fixes being unable to pop back joints of other people. (it was making victim pick the limb)
2015-05-18 03:50:47 +03:00
Chinsky
b08fcb8d3e Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking
Destroying a camera now also cuts wires randomly.
2015-05-18 00:40:56 +03:00
Chinsky
d374cd2681 Merge pull request #9292 from mwerezak/vital-areas
Allows damage to accumulate past max_damage on vital organs
2015-05-18 00:38:16 +03:00
Chinsky
8f50faf93c Merge pull request #9322 from Kelenius/ofVotesAndLinks
Adds a voting link to the vote notification
2015-05-17 23:44:52 +03:00