Commit Graph

18673 Commits

Author SHA1 Message Date
mwerezak
b72abc8b64 Chem reaction cleanup
Reorganizes handle_reactions() in preparation for implementing
reactions-over-time.
Moves chemistry initializations into global_init.
2015-05-22 19:45:31 -04:00
PsiOmegaDelta
558118f2c8 Merge pull request #9372 from GinjaNinja32/reactions
Allows reactions to happen with any level of the required chems
2015-05-21 06:53:51 +02:00
Chinsky
cb3dea3682 Merge pull request #9369 from mwerezak/action-icons
Ports "Makes update_action_buttons() work on-demand"
2015-05-21 03:35:41 +03:00
Zuhayr
98def6e247 Updating dev from master. 2015-05-21 00:08:22 +09:30
GinjaNinja32
f979d80dde Allows reactions to happen with any level of the required chems
Rather than an arbitrary 1u cutoff below which reactions will not happen, reactions will now happen at whatever level of chems are present.
2015-05-20 10:23:31 +01:00
mwerezak
a1185476f8 Makes update_action_buttons() work on-demand
Fixes #9368
2015-05-20 01:28:16 -04:00
Chinsky
284d1cc1f5 Merge pull request #9360 from Kelenius/ofChemAndCarbon
Carbon now clears ingested chemicals
2015-05-20 01:45:13 +03:00
Neerti
6c16923d11 Fixes issue with removing dead plants from hydro treys as a borg. 2015-05-19 15:28:38 -04:00
Chinsky
8871696c52 Merge pull request #9353 from Ccomp5950/goat_simulator3000
Goat Buffs.
2015-05-19 17:56:55 +03: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
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
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
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
Mustafa Kalash
a5aede3b70 Gives IA agents bridge access and the HoS' encryption key. Changes IA agents' supervisor to Nanotrasen officials and regulations. 2015-05-17 12:43:20 -04:00
Zuhayr
59bfc08853 Merge pull request #9317 from Dennok/patch-1
Fix connector updates
2015-05-18 00:21:47 +09:30
Zuhayr
8917a03380 Merge pull request #9296 from PsiOmegaDelta/TurfProcessing
Turf processing
2015-05-17 22:51:45 +09:30
Zuhayr
4ea779ae6c Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
Cleans up welder code.
2015-05-17 20:21:31 +09:30
Kelenius
5fac67ea4e Adds a voting link to the vote notification 2015-05-17 13:33:49 +03:00
Github is ok, I guess
77206c6f5f Update gameticker.dm 2015-05-17 10:36:59 +01:00
Github is ok, I guess
229087c269 Update statistics.dm 2015-05-17 10:36:20 +01:00
PsiOmega
c16d033b18 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-17 11:30:04 +02:00
PsiOmegaDelta
b423ba7bc4 Merge pull request #9319 from Baystation12/master
Dev-freeze
2015-05-17 11:29:39 +02:00