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
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
PsiOmega
c26b4e79b9
Fixes #9244 .
...
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +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
Chinsky
6a14d39209
Merge pull request #9345 from Zuhayr/master
...
Set vine mouse opacity to 2.
2015-05-18 18:19:45 +03:00
Zuhayr
f72203c611
Set vine mouse opacity to 2.
2015-05-18 22:07:00 +09:30
Kelenius
cd9aa7c9af
Fixes mankini typo
2015-05-18 12:34:03 +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
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
PsiOmega
c16d033b18
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-17 11:30:04 +02:00
Zuhayr
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
Zuhayr
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
Chinsky
1f76ae4250
Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
...
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
Zuhayr
a540e97e1b
Stool and table tweaks, adjusted tables on the map.
2015-05-17 13:41:22 +09:30
Zuhayr
2714e458b3
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-17 12:58:09 +09:30
Zuhayr
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
Atlantiscze
bcfbfdedba
CPU Generation adjustment
...
- Doubles CPU generation from APCs. Testing revealed that current values are simply too small.
- Decreases DualCPU hardware boost to +50% CPU generated (instead of +100%)
- Minor code clean-up at hardware selection screen.
2015-05-17 02:54:58 +02:00
PsiOmega
8b39f9201a
Compilation fixes.
2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
14df1e5fb5
Converts beds, chairs and stools.
2015-05-17 03:43:59 +09:30
Zuhayr
dbe8221c60
Merge pull request #9308 from Karolis2011/dev
...
Made sorting and tagger pipes dispensible
2015-05-17 03:23:10 +09:30
Zuhayr
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
mwerezak
9ae57e95e1
Moves mob animations to a new source file, adds attack animation
2015-05-16 12:44:49 -04:00
Zuhayr
8f6666a32e
Converted barricades to material system.
2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
PsiOmegaDelta
d4c205e12a
Merge pull request #9200 from mwerezak/tail-swish
...
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
Zuhayr
b8ca15f541
Tweaks/fixes and greyscale icons.
2015-05-17 00:07:29 +09:30
Karolis2011
0999f1ab78
Made sorting pipes dispesible
...
also fixes #9305
2015-05-16 17:27:39 +03:00
Zuhayr
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
PsiOmega
21dad8bdc0
Teleport anomaly fix.
...
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
2015-05-16 14:46:57 +02:00
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
