Commit Graph

11520 Commits

Author SHA1 Message Date
Daranz
e9d9ff57ba Remove redundant null argument in a view() call 2015-05-21 10:14:40 -04:00
Daranz
bbc8ad6383 Add extra checks for Say :i
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
2015-05-21 09:18:02 -04:00
Daranz
b9dbeeb356 Fix a problem with Say :i not working 2015-05-21 08:53:14 -04:00
Atlantis
d8141445e4 Implements suggestions
- Hardware examine is now generated by hardware's proc.
- Camera network updating now uses proper procs
- Bugfix: APU Generator no longer prevents you from using NanoUI based devices
- Bugfix: Fixes rare runtime on roundstart.
2015-05-21 13:27:18 +02:00
Atlantis
991546df2a Span Class in shields code. 2015-05-21 12:19:23 +02:00
Kelenius
360113850a Updates Chemistry-Readme.dm
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03:00
Zuhayr
52ae206174 Merge pull request #9391 from comma/ghettoMD
Missed one baddie
2015-05-21 18:30:06 +09:30
PsiOmegaDelta
66b8d67637 Merge pull request #9390 from mwerezak/attack-animation
Attack animations
2015-05-21 06:52:30 +02:00
Chinsky
91de5b2d9d Merge pull request #9381 from GinjaNinja32/patch-1
Fixes #9380
2015-05-21 03:27:28 +03:00
Chinsky
ecc2b3c437 Merge pull request #9258 from mwerezak/charge
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Chinsky
97b2a63b76 Missed one baddie
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
GinjaNinja32
9888a8a70b Another PoolOrNew(new /type, loc) fix 2015-05-20 16:49:18 +01:00
Zuhayr
c3f0f42ec2 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials 2015-05-21 00:49:14 +09:30
Zuhayr
98def6e247 Updating dev from master. 2015-05-21 00:08:22 +09:30
mwerezak
01e8246e64 Clean up world print 2015-05-20 00:35:26 -04:00
Zuhayr
a6f59edc22 Bit of documentation. 2015-05-20 14:00:14 +09:30
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
mwerezak
20b72b9911 Adds attack animation calls 2015-05-20 00:18:32 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
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
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